summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorJon Olav Hauglid <jon.hauglid@sun.com>2009-10-14 14:50:26 +0200
committerJon Olav Hauglid <jon.hauglid@sun.com>2009-10-14 14:50:26 +0200
commit3dce051cc5bf2ba1dc309627658ccf5de32bf3cb (patch)
treede10b4f6832be3bc3450e930f98dd431b2d39b50 /sql
parentc0c7925cae8ae111e4d7a01e3e32712a74812d7b (diff)
downloadmariadb-git-3dce051cc5bf2ba1dc309627658ccf5de32bf3cb.tar.gz
Backport of revno: 2617.81.4
Bug #47274 assert in open_table on CREATE TABLE <already existing> The problem was an assertion during execution of CREATE TABLES. This assertion would occur if INSERT DELAYED or REPLACE DELAYED were used to update a table containing an AUTO_INCREMENT column and if the inserted row had a user-supplied value for that column. Any CREATE TABLE statement (including CREATE TABLE SELECT and CREATE TABLE LIKE) trying to create the same table and which followed the INSERT/REPLACED would cause the assertion. The problem was only noticeable on debug builds of the server and not present in the mysql-5.1 tree. The cause of the problem was that the code for delayed insert did not properly reset the TABLE->auto_increment_if_null flag after The flag is used to indicate that a non-null value of an auto_increment field has been provided by the user or retrieved from a current record. Open_tables() contains an assertion that tests this flag, and this was triggered by CREATE TABLE. This patch fixes the problem by resetting the auto_increment_if_null field to FALSE once INSERT/REPLACE DELAYED has updated the table, similar to what is done already for regular INSERT statements. Test case added to delayed.test.
Diffstat (limited to 'sql')
-rw-r--r--sql/sql_insert.cc6
1 files changed, 6 insertions, 0 deletions
diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc
index 1ef4d5827ec..fd19a025429 100644
--- a/sql/sql_insert.cc
+++ b/sql/sql_insert.cc
@@ -2729,6 +2729,12 @@ bool Delayed_insert::handle_inserts(void)
thread_safe_increment(delayed_insert_writes,&LOCK_delayed_status);
pthread_mutex_lock(&mutex);
+ /*
+ Reset the table->auto_increment_field_not_null as it is valid for
+ only one row.
+ */
+ table->auto_increment_field_not_null= FALSE;
+
delete row;
/*
Let READ clients do something once in a while