diff options
| author | unknown <joreland@mysql.com> | 2005-02-10 07:51:44 +0100 |
|---|---|---|
| committer | unknown <joreland@mysql.com> | 2005-02-10 07:51:44 +0100 |
| commit | b3d84a680a7ce8a1a5ef0df9eb26efa1cbc1d94a (patch) | |
| tree | 6e953ce361d9ad4d1b308a3522e7f47d5a2bbd9b | |
| parent | 3afb61e17471d73e1993ab3123e816b629a25e51 (diff) | |
| parent | 3a2ddb116792a24925591bf5f6b95a3382fb0aa1 (diff) | |
| download | mariadb-git-b3d84a680a7ce8a1a5ef0df9eb26efa1cbc1d94a.tar.gz | |
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0
| -rw-r--r-- | sql/sql_parse.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 8462066dcff..0a0258465fb 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -1310,7 +1310,7 @@ enum enum_mysql_completiontype { SAVEPOINT_NAME_ROLLBACK=2, SAVEPOINT_NAME_RELEASE=4, COMMIT_AND_CHAIN=6, - ROLLBACK_AND_CHAIN=7, + ROLLBACK_AND_CHAIN=7 }; int mysql_endtrans(THD *thd, enum enum_mysql_completiontype completion, @@ -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); } |