diff options
| author | monty@mashka.mysql.fi <> | 2003-10-15 21:41:13 +0300 |
|---|---|---|
| committer | monty@mashka.mysql.fi <> | 2003-10-15 21:41:13 +0300 |
| commit | 84d9d9807841cbbcb756c24ef56f0d0fe5ec3e2f (patch) | |
| tree | 1cffa0627ab98f85815d577bb2824198ce5de99b /sql/sql_insert.cc | |
| parent | 4897c6649d927419d95ad9a315dc6316110be2d4 (diff) | |
| download | mariadb-git-84d9d9807841cbbcb756c24ef56f0d0fe5ec3e2f.tar.gz | |
Better fix for CREATE TABLE IF NOT EXISTS ... SELECT
Fixed chsize() problem on windows
Extend default timeout on windows clients to 1 year (to avoid timeout problems)
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; } |