1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge bk-internal.mysql.com:/home/bk/mysql-5.0

Browse Source 
into mysql.com:/home/my/mysql-5.0
This commit is contained in:
unknown 2005-02-10 14:51:06 +02:00
commit 2d435c8a2e
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sql/sql_parse.cc
View File

@ -2234,7 +2234,9 @@ mysql_execute_command(THD *thd)
/* Locked closure of all tables */ /* Locked closure of all tables */
TABLE_LIST *locked_tables= NULL; TABLE_LIST *locked_tables= NULL;
/* Saved variable value */ /* Saved variable value */
#ifdef HAVE_INNOBASE_DB
my_bool old_innodb_table_locks= thd->variables.innodb_table_locks; my_bool old_innodb_table_locks= thd->variables.innodb_table_locks;
#endif
DBUG_ENTER("mysql_execute_command"); 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))) if ((locked_tables= sp_hash_to_table_list(thd, &lex->sptabs)))
{ {
#ifdef HAVE_INNOBASE_DB
thd->variables.innodb_table_locks= FALSE; thd->variables.innodb_table_locks= FALSE;
#endif
sp_open_and_lock_tables(thd, locked_tables); sp_open_and_lock_tables(thd, locked_tables);
} }
} }
@ -4346,7 +4350,9 @@ cleanup:
if (locked_tables) if (locked_tables)
{ {
#ifdef HAVE_INNOBASE_DB
thd->variables.innodb_table_locks= old_innodb_table_locks; thd->variables.innodb_table_locks= old_innodb_table_locks;
#endif
if (thd->locked_tables) if (thd->locked_tables)
sp_unlock_tables(thd); sp_unlock_tables(thd);
} }