diff options
author | unknown <joreland@mysql.com> | 2005-02-25 09:35:09 +0100 |
---|---|---|
committer | unknown <joreland@mysql.com> | 2005-02-25 09:35:09 +0100 |
commit | f46729c29fa429d72916989d93dd1f534ca43c5d (patch) | |
tree | 4f899c273634696d48e77d8a01fff6aa6b90e38b /sql | |
parent | 918a030b4518bf6441d77d1ad376d7f7283db353 (diff) | |
download | mariadb-git-f46729c29fa429d72916989d93dd1f534ca43c5d.tar.gz |
Cset exclude: joreland@mysql.com|ChangeSet|20050224071025|18754
sql/sql_parse.cc:
Exclude
Diffstat (limited to 'sql')
-rw-r--r-- | sql/sql_parse.cc | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 8ba4e1e3a84..9a78daa1479 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -1865,11 +1865,7 @@ 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 @@ -4605,11 +4601,8 @@ 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); } |