Changeset: 78be57a473e4 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=78be57a473e4 Modified Files: sql/ChangeLog.Oct2014 sql/backends/monet5/sql_scenario.c sql/backends/monet5/sql_upgrades.c Branch: default Log Message:
Merge with Oct2014 branch. diffs (29 lines): diff --git a/sql/ChangeLog.Oct2014 b/sql/ChangeLog.Oct2014 --- a/sql/ChangeLog.Oct2014 +++ b/sql/ChangeLog.Oct2014 @@ -1,3 +1,9 @@ # ChangeLog file for sql # This file is updated with Maddlog +* Fri Nov 14 2014 Sjoerd Mullender <[email protected]> +- A number of bugs were fixed in the code to upgrade a database from + previous releases. This version should fix the upgrade of a database + that had been upgraded to the Oct2014 release, but also properly + upgrade directly from Jan2014 and Feb2013 releases. + diff --git a/sql/backends/monet5/sql_upgrades.c b/sql/backends/monet5/sql_upgrades.c --- a/sql/backends/monet5/sql_upgrades.c +++ b/sql/backends/monet5/sql_upgrades.c @@ -486,9 +486,9 @@ external name sql.analyze;\n"); /* 17_compress script has been removed */ pos += snprintf(buf + pos, bufsize - pos, "drop procedure gzcompress;\n"); - pos += snprintf(buf + pos, bufsize - pos, "drop procedure gzcdeompress;\n"); - pos += snprintf(buf + pos, bufsize - pos, "drop procedure gzctruncate;\n"); - pos += snprintf(buf + pos, bufsize - pos, "drop procedure gzcexpand;\n"); + pos += snprintf(buf + pos, bufsize - pos, "drop procedure gzdecompress;\n"); + pos += snprintf(buf + pos, bufsize - pos, "drop procedure gztruncate;\n"); + pos += snprintf(buf + pos, bufsize - pos, "drop procedure gzexpand;\n"); if (schema) { pos += snprintf(buf + pos, bufsize - pos, "set schema \"%s\";\n", schema); _______________________________________________ checkin-list mailing list [email protected] https://www.monetdb.org/mailman/listinfo/checkin-list
