Changeset: 981ac02ef164 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=981ac02ef164 Modified Files: debian/control sql/server/sql_parser.y Branch: default Log Message:
Merge with Jan2014 branch. diffs (27 lines): diff --git a/debian/control b/debian/control --- a/debian/control +++ b/debian/control @@ -9,8 +9,9 @@ Vcs-Hg: http://dev.monetdb.org/hg/MonetD # http://www.debian.org/doc/debian-policy/ch-relationships.html Build-Depends: debhelper (>= 5), autotools-dev, bison, flex, libbz2-dev, libcurl4-gnutls-dev, libgeos-dev, libgsl0-dev, libpcre3-dev, - libreadline-gplv2-dev|libreadline-dev, libssl-dev, libxml2-dev, perl, - python, ruby, rubygems, unixodbc-dev, uuid-dev, zlib1g-dev, python3 + libreadline-gplv2-dev | libreadline-dev, libssl-dev, libxml2-dev, perl, + ruby, rubygems | libyaml-0-2, unixodbc-dev, uuid-dev, zlib1g-dev, + python, python3 # Build-Depends: libraptor1-dev Standards-Version: 3.8.0 X-Python-Version: >= 2.6 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 @@ -73,7 +73,7 @@ %lex-param { void *m } /* reentrant parser */ -%pure_parser +%pure-parser %union { int i_val,bval; wrd w_val; _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
