Changeset: beb3020de222 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=beb3020de222
Modified Files:
sql/server/sql_parser.y
Branch: geo
Log Message:
sql_parser.y: restore keyword "storage" that apparently got lost during "bad"
merge
or due to incorrectly resolved merge conflict
Found by running Mtest.py, looking at failing tests,
and checking the diff between the default branch and the geo branch ...
diffs (11 lines):
diff --git a/sql/server/sql_parser.y b/sql/server/sql_parser.y
--- a/sql/server/sql_parser.y
+++ b/sql/server/sql_parser.y
@@ -5143,6 +5143,7 @@ non_reserved_word:
| TEMPORARY { $$ = sa_strdup(SA, "temporary"); }
| TEMP { $$ = sa_strdup(SA, "temp"); }
| ANALYZE { $$ = sa_strdup(SA, "analyze"); }
+| STORAGE { $$ = sa_strdup(SA, "storage"); }
| GEOMETRY { $$ = sa_strdup(SA, "geometry"); }
;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
