Changeset: 8f3ebfcdd261 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8f3ebfcdd261
Modified Files:
sql/backends/monet5/sql_scenario.c
Branch: default
Log Message:
Free lock before returning.
This prevents deadlock when exiting after a failed catalogue
initialization.
diffs (15 lines):
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
@@ -241,8 +241,10 @@ SQLinit(void)
SQLdebug |= 64;
if (readonly)
SQLdebug |= 32;
- if ((SQLnewcatalog = mvc_init(SQLdebug, store_bat, readonly,
single_user, 0)) < 0)
+ if ((SQLnewcatalog = mvc_init(SQLdebug, store_bat, readonly,
single_user, 0)) < 0) {
+ MT_lock_unset(&sql_contextLock);
throw(SQL, "SQLinit", "Catalogue initialization failed");
+ }
SQLinitialized = TRUE;
MT_lock_unset(&sql_contextLock);
if (MT_create_thread(&sqllogthread, (void (*)(void *)) mvc_logmanager,
NULL, MT_THR_JOINABLE) != 0) {
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
