summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sql/sql_parse.cc9
1 files changed, 8 insertions, 1 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
index 9a1b2eb0430..1e22d7c9f83 100644
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -1866,7 +1866,11 @@ bool dispatch_command(enum enum_server_command command, THD *thd,
mysqld_list_fields(thd,&table_list,fields);
thd->lex->unit.cleanup();
thd->cleanup_after_query();
+#ifdef HAVE_INNOBASE_DB
release_local_lock(thd, locked_tables, old_innodb_table_locks);
+#else
+ release_local_lock(thd, locked_tables, false);
+#endif
break;
}
#endif
@@ -4597,8 +4601,11 @@ cleanup:
if (thd->lock == thd->locked_tables)
thd->lock= 0;
}
-
+#ifdef HAVE_INNOBASE_DB
release_local_lock(thd, locked_tables, old_innodb_table_locks);
+#else
+ release_local_lock(thd, locked_tables, false);
+#endif
DBUG_RETURN(res || thd->net.report_error);
}