Changeset: a45641372344 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a45641372344
Modified Files:
sql/server/sql_parser.y
Branch: default
Log Message:
Merge with Oct2020 branch.
diffs (55 lines):
diff --git a/NT/mkodbcwxs.py b/NT/mkodbcwxs.py
--- a/NT/mkodbcwxs.py
+++ b/NT/mkodbcwxs.py
@@ -80,9 +80,9 @@ def main():
r'lib\MonetODBC.dll', # r'lib\MonetODBC.pdb',
r'lib\MonetODBCs.dll', # r'lib\MonetODBCs.pdb',
r'bin\stream.dll', # r'lib\stream.pdb',
- vcpkg.format(r'bin\libiconv.dll'),
+ vcpkg.format(r'bin\iconv-2.dll'),
vcpkg.format(r'bin\bz2.dll'),
- vcpkg.format(r'bin\libcharset.dll'), # for libiconv.dll
+ vcpkg.format(r'bin\charset-1.dll'), # for iconv-2.dll
vcpkg.format(r'bin\libcrypto-1_1{}.dll'.format(libcrypto)),
vcpkg.format(r'bin\zlib1.dll')])
print(r' </Directory>')
diff --git a/NT/mksqlwxs.py b/NT/mksqlwxs.py
--- a/NT/mksqlwxs.py
+++ b/NT/mksqlwxs.py
@@ -145,10 +145,10 @@ def main():
r'bin\monetdb5.dll',
r'bin\monetdbsql.dll',
r'bin\stream.dll',
- vcpkg.format(r'bin\libiconv.dll'),
+ vcpkg.format(r'bin\iconv-2.dll'),
vcpkg.format(r'bin\bz2.dll'),
+ vcpkg.format(r'bin\charset-1.dll'), # for iconv-2.dll
vcpkg.format(r'bin\getopt.dll'),
- vcpkg.format(r'bin\libcharset.dll'), # for libiconv.dll
vcpkg.format(r'bin\libcrypto-1_1{}.dll'.format(libcrypto)),
vcpkg.format(r'bin\libxml2.dll'),
vcpkg.format(r'bin\lz4.dll'),
@@ -199,10 +199,10 @@ def main():
r'lib\monetdb5.lib',
r'lib\monetdbsql.lib',
r'lib\stream.lib',
- vcpkg.format(r'lib\libiconv.lib'),
+ vcpkg.format(r'lib\iconv.lib'),
vcpkg.format(r'lib\bz2.lib'),
+ vcpkg.format(r'lib\charset.lib'),
vcpkg.format(r'lib\getopt.lib'),
- vcpkg.format(r'lib\libcharset.lib'),
vcpkg.format(r'lib\libcrypto.lib'),
vcpkg.format(r'lib\libxml2.lib'),
vcpkg.format(r'lib\lz4.lib'),
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
@@ -1502,7 +1502,6 @@ table_def:
append_string(l, NULL);
append_list(l, NULL);
append_int(l, $2);
- append_list(l, $5);
append_symbol(l, NULL); /* only used for merge table */
$$ = _symbol_create_list( SQL_CREATE_TABLE, l ); }
| TABLE if_not_exists qname FROM sqlLOADER func_ref
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
