Changeset: afc766d78f0b for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=afc766d78f0b
Modified Files:
configure.ag
sql/backends/monet5/sql_scenario.c
sql/test/leaks/Tests/check0.stable.out
sql/test/leaks/Tests/check1.stable.out
sql/test/leaks/Tests/check2.stable.out
sql/test/leaks/Tests/check3.stable.out
sql/test/leaks/Tests/check4.stable.out
sql/test/leaks/Tests/check5.stable.out
sql/test/mapi/Tests/php_monetdb.stable.out
Branch: default
Log Message:
Merge with Dec2011 branch.
diffs (57 lines):
diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -897,12 +897,12 @@ AC_ARG_ENABLE(instrument,
dnl check whether no (explictly chosen) mutual exclusive combinations
dnl were made, compatability matrix:
-dnl deb ass opt war pro ins
-dnl debug \ C X C C C
-dnl assert C \ C C C C
-dnl optimize X C \ C X X
-dnl profile C C X C \ C
-dnl instrument C C X C C \
+dnl deb ass opt pro ins
+dnl debug \ C X C C
+dnl assert C \ C C C
+dnl optimize X C \ X X
+dnl profile C C X \ C
+dnl instrument C C X C \
case "x$enable_debug.$enable_optim.$enable_prof.$enable_instrument" in
# find conflicts
diff --git a/sql/ChangeLog.Dec2011 b/sql/ChangeLog.Dec2011
--- a/sql/ChangeLog.Dec2011
+++ b/sql/ChangeLog.Dec2011
@@ -1,6 +1,11 @@
# ChangeLog file for sql
# This file is updated with Maddlog
+* Fri Feb 17 2012 Sjoerd Mullender <[email protected]>
+- Fixed a crash that happened at the end of a database upgrade to the
+ Dec2011 database scheme. The crash happened during cleanup after the
+ database was upgraded, so it was merely inconvenient.
+
* Wed Feb 15 2012 Sjoerd Mullender <[email protected]>
- Stripped off implementation-specific parts from error messages before
they get presented to the user.
diff --git a/sql/backends/monet5/sql_scenario.c
b/sql/backends/monet5/sql_scenario.c
--- a/sql/backends/monet5/sql_scenario.c
+++ b/sql/backends/monet5/sql_scenario.c
@@ -655,7 +655,7 @@ SQLstatementIntern(Client c, str *expr,
*o = *m;
/* create private allocator */
- assert(m->sa == NULL);
+ m->sa = NULL;
SQLtrans(m);
status = m->session->status;
@@ -786,6 +786,7 @@ endofcompile:
bstream_destroy(m->scanner.rs);
if (m->sa)
sa_destroy(m->sa);
+ m->sa = NULL;
m->sym = NULL;
/* variable stack maybe resized, ie we need to keep the new stack */
status = m->session->status;
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
