Update of /cvsroot/monetdb/sql/src/server
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv25925/src/server
Modified Files:
sql_parser.mx sql_scan.mx
Log Message:
make sure we don't switch to interative modes (TRACE/DEBUG) when communicating
with non interactive clients (LINE_1 mode)
Index: sql_scan.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/server/sql_scan.mx,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -d -r1.129 -r1.130
--- sql_scan.mx 2 Sep 2007 19:41:43 -0000 1.129
+++ sql_scan.mx 6 Sep 2007 11:01:01 -0000 1.130
@@ -28,7 +28,7 @@
#include <stream.h>
#include <stdio.h>
-typedef enum { LINE_1, LINE_N, BLOCKED } prot;
+typedef enum { LINE_1, LINE_N } prot;
struct scanner {
bstream *rs;
Index: sql_parser.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/server/sql_parser.mx,v
retrieving revision 1.253
retrieving revision 1.254
diff -u -d -r1.253 -r1.254
--- sql_parser.mx 2 Sep 2007 19:41:43 -0000 1.253
+++ sql_parser.mx 6 Sep 2007 11:01:01 -0000 1.254
@@ -728,6 +728,11 @@
m->sym = $$ = $3; YYACCEPT;
}
| SQL_DEBUG { mvc *m = (mvc*)parm;
+ if (m->scanner.mode == LINE_1) {
+ $$ = NULL;
+ yyerror("We only support debugging SQL in
interactive mode");
+ YYABORT;
+ }
m->mode = m_debug;
m->scanner.as = m->scanner.yycur;
m->scanner.key = 0;
@@ -736,6 +741,11 @@
m->sym = $$ = $3; YYACCEPT;
}
| SQL_TRACE { mvc *m = (mvc*)parm;
+ if (m->scanner.mode == LINE_1) {
+ $$ = NULL;
+ yyerror("We do not support tracing SQL in
interactive mode");
+ YYABORT;
+ }
m->mode = m_trace;
m->scanner.as = m->scanner.yycur;
m->scanner.key = 0;
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
