diff options
| author | unknown <joreland@mysql.com> | 2005-02-24 08:19:57 +0100 |
|---|---|---|
| committer | unknown <joreland@mysql.com> | 2005-02-24 08:19:57 +0100 |
| commit | 81a39356073af19066a43f6974ea2ff16ea80311 (patch) | |
| tree | 483bc4fde1de50d3aee95f888bcc3f15ab47c9c4 /sql/sql_parse.cc | |
| parent | dcdbfa65276ee2d1ba79c1a8a65e49a22d56d524 (diff) | |
| parent | ee27d6a69b004a8ff20feb36f24336e92812ea0a (diff) | |
| download | mariadb-git-81a39356073af19066a43f6974ea2ff16ea80311.tar.gz | |
Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'sql/sql_parse.cc')
| -rw-r--r-- | sql/sql_parse.cc | 9 |
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); } |