diff options
author | Satya B <satya.bn@sun.com> | 2009-09-04 12:27:10 +0530 |
---|---|---|
committer | Satya B <satya.bn@sun.com> | 2009-09-04 12:27:10 +0530 |
commit | 7bfdc5bbf5cd0ffb9e35d19d80ac9aa527938ba1 (patch) | |
tree | 97b65ef8882290efa15fe796624491f237faaa0d /sql/sql_insert.cc | |
parent | 83967a64298453dd514cf17e7ec8c6b29cbf6543 (diff) | |
parent | 6e27ef435e3863382295f1a1d41424c9b8d4c197 (diff) | |
download | mariadb-git-7bfdc5bbf5cd0ffb9e35d19d80ac9aa527938ba1.tar.gz |
merge mysql-5.0-bugteam to mysql-5.1-bugteam
Diffstat (limited to 'sql/sql_insert.cc')
-rw-r--r-- | sql/sql_insert.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc index a799cbea4c2..b79b9b1ae9e 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -3596,7 +3596,7 @@ select_create::prepare(List<Item> &values, SELECT_LEX_UNIT *u) DBUG_EXECUTE_IF("sleep_create_select_before_check_if_exists", my_sleep(6000000);); if (!(create_info->options & HA_LEX_CREATE_TMP_TABLE) && - create_table->table->db_stat) + (create_table->table && create_table->table->db_stat)) { /* Table already exists and was open at open_and_lock_tables() stage. */ if (create_info->options & HA_LEX_CREATE_IF_NOT_EXISTS) |