summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <pem@mysql.comhem.se>2005-02-10 11:40:54 +0100
committerunknown <pem@mysql.comhem.se>2005-02-10 11:40:54 +0100
commit7684e10018503eba3bf281d587993761fae6e5fb (patch)
tree88fb5e05a97d13d79d702f7ade9194ca04843f36
parent3afb61e17471d73e1993ab3123e816b629a25e51 (diff)
downloadmariadb-git-7684e10018503eba3bf281d587993761fae6e5fb.tar.gz
Added missing #ifdef HAVE_INNOBASE_DB:s in sql_parse.cc.
sql/sql_parse.cc: Added missing #ifdef HAVE_INNOBASE_DB:s.
-rw-r--r--sql/sql_parse.cc6
1 files changed, 6 insertions, 0 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
index 8462066dcff..19dc6b389e3 100644
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -2234,7 +2234,9 @@ mysql_execute_command(THD *thd)
/* Locked closure of all tables */
TABLE_LIST *locked_tables= NULL;
/* Saved variable value */
+#ifdef HAVE_INNOBASE_DB
my_bool old_innodb_table_locks= thd->variables.innodb_table_locks;
+#endif
DBUG_ENTER("mysql_execute_command");
/*
@@ -2330,7 +2332,9 @@ mysql_execute_command(THD *thd)
{
if ((locked_tables= sp_hash_to_table_list(thd, &lex->sptabs)))
{
+#ifdef HAVE_INNOBASE_DB
thd->variables.innodb_table_locks= FALSE;
+#endif
sp_open_and_lock_tables(thd, locked_tables);
}
}
@@ -4346,7 +4350,9 @@ cleanup:
if (locked_tables)
{
+#ifdef HAVE_INNOBASE_DB
thd->variables.innodb_table_locks= old_innodb_table_locks;
+#endif
if (thd->locked_tables)
sp_unlock_tables(thd);
}