Update of /cvsroot/monetdb/sql/src/server
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv21340
Modified Files:
Tag: May2009
sql_parser.mx sql_scan.mx
Log Message:
Avoid name clashes due to name space pollution from system include files.
U sql_scan.mx
Index: sql_scan.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/server/sql_scan.mx,v
retrieving revision 1.146.2.1
retrieving revision 1.146.2.2
diff -u -d -r1.146.2.1 -r1.146.2.2
--- sql_scan.mx 2 Jun 2009 10:49:51 -0000 1.146.2.1
+++ sql_scan.mx 5 Jun 2009 08:22:40 -0000 1.146.2.2
@@ -298,7 +298,7 @@
keywords_insert("LEVEL", LEVEL);
keywords_insert("UNCOMMITTED", UNCOMMITTED);
keywords_insert("COMMITTED", COMMITTED);
- keywords_insert("REPEATABLE", REPEATABLE);
+ keywords_insert("REPEATABLE", sqlREPEATABLE);
keywords_insert("SERIALIZABLE", SERIALIZABLE);
keywords_insert("DIAGNOSTICS", DIAGNOSTICS);
keywords_insert("SIZE", sqlSIZE);
U sql_parser.mx
Index: sql_parser.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/server/sql_parser.mx,v
retrieving revision 1.306.2.2
retrieving revision 1.306.2.3
diff -u -d -r1.306.2.2 -r1.306.2.3
--- sql_parser.mx 21 May 2009 15:13:43 -0000 1.306.2.2
+++ sql_parser.mx 5 Jun 2009 08:22:40 -0000 1.306.2.3
@@ -638,7 +638,7 @@
%token <sval> LEFT RIGHT FULL OUTER NATURAL CROSS JOIN INNER
%token <sval> COMMIT ROLLBACK SAVEPOINT RELEASE WORK CHAIN NO PRESERVE ROWS
%token START TRANSACTION READ WRITE ONLY ISOLATION LEVEL
-%token UNCOMMITTED COMMITTED REPEATABLE SERIALIZABLE DIAGNOSTICS sqlSIZE
+%token UNCOMMITTED COMMITTED sqlREPEATABLE SERIALIZABLE DIAGNOSTICS sqlSIZE
%token <sval> ASYMMETRIC SYMMETRIC ORDER BY
%token <sval> LIKE BETWEEN
@@ -2393,7 +2393,7 @@
iso_level:
READ UNCOMMITTED
| READ COMMITTED
- | REPEATABLE READ
+ | sqlREPEATABLE READ
| SERIALIZABLE
;
------------------------------------------------------------------------------
OpenSolaris 2009.06 is a cutting edge operating system for enterprises
looking to deploy the next generation of Solaris that includes the latest
innovations from Sun and the OpenSource community. Download a copy and
enjoy capabilities such as Networking, Storage and Virtualization.
Go to: http://p.sf.net/sfu/opensolaris-get
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
