diff options
author | monty@mashka.mysql.fi <> | 2003-10-15 21:50:36 +0300 |
---|---|---|
committer | monty@mashka.mysql.fi <> | 2003-10-15 21:50:36 +0300 |
commit | 4d45ad98b966cf26b8aaf888deed7d1c4c61fc84 (patch) | |
tree | 0ad2e2381b4b10b0164a94b12e0b415c002896dc /sql/sql_insert.cc | |
parent | 33e5f4edec5b6ffb472e17cfc63f67895dc27719 (diff) | |
parent | 84d9d9807841cbbcb756c24ef56f0d0fe5ec3e2f (diff) | |
download | mariadb-git-4d45ad98b966cf26b8aaf888deed7d1c4c61fc84.tar.gz |
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mashka.mysql.fi:/home/my/mysql-4.0
Diffstat (limited to 'sql/sql_insert.cc')
-rw-r--r-- | sql/sql_insert.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc index ad08ad6ccd6..3aefee61c27 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -1440,7 +1440,6 @@ select_create::prepare(List<Item> &values) if (table->fields < values.elements) { - do_not_drop=1; my_printf_error(ER_WRONG_VALUE_COUNT_ON_ROW, ER(ER_WRONG_VALUE_COUNT_ON_ROW), MYF(0),1); @@ -1528,7 +1527,7 @@ void select_create::abort() enum db_type table_type=table->db_type; if (!table->tmp_table) hash_delete(&open_cache,(byte*) table); - if (!do_not_drop) + if (!create_info->table_existed) quick_rm_table(table_type,db,name); table=0; } |