Update of /cvsroot/monetdb/sql/src/server
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv15316/src/server
Modified Files:
sql_parser.mx
Log Message:
propagated changes of Tuesday Oct 27 2009 - Thursday Oct 29 2009
from the Nov2009 branch to the development trunk
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2009/10/27 - mr-meltdown: src/server/sql_parser.mx,1.322.2.2
remove TRACE interactive restriction (with wrong error message), since we can
now use TRACE <stmt> using e.g. JDBC
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2009/10/27 - mr-meltdown: src/server/sql_parser.mx,1.322.2.3
PLAN violates the communication protocol because it doesn't send a header (it
doesn't know how many rows will follow), so disable it. This is a pity,
because PLAN is pretty useful.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Index: sql_parser.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/server/sql_parser.mx,v
retrieving revision 1.323
retrieving revision 1.324
diff -u -d -r1.323 -r1.324
--- sql_parser.mx 6 Oct 2009 13:40:28 -0000 1.323
+++ sql_parser.mx 29 Oct 2009 08:43:18 -0000 1.324
@@ -746,6 +746,10 @@
m->sym = $$ = $3; YYACCEPT;
}
| SQL_PLAN { mvc *m = (mvc*)parm;
+ if (m->scanner.mode == LINE_1) {
+ yyerror("PLAN is only available in mclient due
to protocol restrictions");
+ YYABORT;
+ }
m->emode = m_plan;
m->scanner.as = m->scanner.yycur;
m->scanner.key = 0;
@@ -772,10 +776,6 @@
}
sqlstmt { $$ = $3; YYACCEPT; }
| SQL_TRACE { mvc *m = (mvc*)parm;
- if (m->scanner.mode == LINE_1) {
- yyerror("We do not support tracing SQL in
interactive mode");
- YYABORT;
- }
m->emod |= mod_trace;
m->scanner.as = m->scanner.yycur;
m->scanner.key = 0;
------------------------------------------------------------------------------
Come build with us! The BlackBerry(R) Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9 - 12, 2009. Register now!
http://p.sf.net/sfu/devconference
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
