diff options
| author | unknown <igor@olga.mysql.com> | 2007-08-04 20:53:26 -0700 |
|---|---|---|
| committer | unknown <igor@olga.mysql.com> | 2007-08-04 20:53:26 -0700 |
| commit | 983cda8d36be587827a3ddfdd86ddcf91630fb29 (patch) | |
| tree | 9646f1775f203eb139348458ee9c74ed588ea4b2 /sql/sql_table.cc | |
| parent | a150ca337fc0fac1c071e28c228cd390288fdb56 (diff) | |
| parent | 71c3c0cfd57e1d37e4f04427388f8c473283540c (diff) | |
| download | mariadb-git-983cda8d36be587827a3ddfdd86ddcf91630fb29.tar.gz | |
Merge olga.mysql.com:/home/igor/mysql-5.0
into olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-merge
sql/mysqld.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_table.cc:
Auto merged
Diffstat (limited to 'sql/sql_table.cc')
| -rw-r--r-- | sql/sql_table.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/sql_table.cc b/sql/sql_table.cc index 18c58d3a36a..6cbe98fe862 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -256,8 +256,8 @@ int mysql_rm_table_part2(THD *thd, TABLE_LIST *tables, bool if_exists, drop_locked_tables(thd, db, table->table_name); if (thd->killed) { - thd->no_warnings_for_error= 0; - DBUG_RETURN(-1); + error=-1; + goto err_with_placeholders; } alias= (lower_case_table_names == 2) ? table->alias : table->table_name; /* remove form file and isam files */ @@ -338,6 +338,7 @@ int mysql_rm_table_part2(THD *thd, TABLE_LIST *tables, bool if_exists, } } +err_with_placeholders: if (!drop_temporary) unlock_table_names(thd, tables, (TABLE_LIST*) 0); thd->no_warnings_for_error= 0; |