Merge lp:~akopytov/percona-server/bug1035225-5.1 into lp:percona-server/5.1

[Alexey Kopytov]

[Alexey Kopytov (akopytov)]

http://jenkins.percona.com/view/PS%205.1/job/percona-server-5.1-param/366/

[Alexey Kopytov (akopytov)]

issue #25040

[Laurynas Biveinis (laurynas-biveinis)]

review: Approve

=== added file 'Percona-Server/mysql-test/r/percona_bug1035225.result'
--- Percona-Server/mysql-test/r/percona_bug1035225.result	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/r/percona_bug1035225.result	2012-08-13 13:40:26 +0000
@@ -0,0 +1,32 @@
+CREATE TABLE t(
+id INT NOT NULL AUTO_INCREMENT PRIMARY KEY,
+k INT,
+c CHAR(1),
+UNIQUE KEY(k)) ENGINE=InnoDB;
+#
+# Connection 1
+#
+SET DEBUG_SYNC='ha_write_row_end SIGNAL continue2 WAIT_FOR continue1';
+affected rows: 0
+INSERT INTO t(k) VALUES (1), (2), (3) ON DUPLICATE KEY UPDATE c='1';
+#
+# Connection 2
+#
+SET DEBUG_SYNC='start_ha_write_row WAIT_FOR continue2';
+affected rows: 0
+SET DEBUG_SYNC='after_mysql_insert SIGNAL continue1';
+affected rows: 0
+INSERT INTO t(k) VALUES (2), (4), (5) ON DUPLICATE KEY UPDATE c='2';
+affected rows: 3
+info: Records: 3  Duplicates: 0  Warnings: 0
+affected rows: 4
+info: Records: 3  Duplicates: 1  Warnings: 0
+SET DEBUG_SYNC='RESET';
+SELECT * FROM t ORDER BY k;
+id	k	c
+1	1	NULL
+4	2	1
+2	3	NULL
+5	4	NULL
+6	5	NULL
+DROP TABLE t;

=== added file 'Percona-Server/mysql-test/t/percona_bug1035225.test'
--- Percona-Server/mysql-test/t/percona_bug1035225.test	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/t/percona_bug1035225.test	2012-08-13 13:40:26 +0000
@@ -0,0 +1,47 @@
+##########################################################################
+# LP bug #1035225 / MySQL bug #66301: INSERT ... ON DUPLICATE KEY UPDATE +
+# innodb_autoinc_lock_mode=1 is broken
+##########################################################################
+
+--source include/have_innodb.inc
+--source include/have_debug_sync.inc
+
+CREATE TABLE t(
+       id INT NOT NULL AUTO_INCREMENT PRIMARY KEY,
+       k INT,
+       c CHAR(1),
+       UNIQUE KEY(k)) ENGINE=InnoDB;
+
+--enable_info
+
+--connect(con1, localhost, root)
+--connect(con2, localhost, root)
+
+--connection con1
+
+--echo #
+--echo # Connection 1
+--echo #
+SET DEBUG_SYNC='ha_write_row_end SIGNAL continue2 WAIT_FOR continue1';
+--send INSERT INTO t(k) VALUES (1), (2), (3) ON DUPLICATE KEY UPDATE c='1'
+
+--connection con2
+--echo #
+--echo # Connection 2
+--echo #
+SET DEBUG_SYNC='start_ha_write_row WAIT_FOR continue2';
+SET DEBUG_SYNC='after_mysql_insert SIGNAL continue1';
+INSERT INTO t(k) VALUES (2), (4), (5) ON DUPLICATE KEY UPDATE c='2';
+
+--connection con1
+--reap
+--disable_info
+SET DEBUG_SYNC='RESET';
+SELECT * FROM t ORDER BY k;
+
+--disconnect con1
+--disconnect con2
+
+--connection default
+
+DROP TABLE t;

=== modified file 'Percona-Server/sql/handler.cc'
--- Percona-Server/sql/handler.cc	2012-06-07 10:43:53 +0000
+++ Percona-Server/sql/handler.cc	2012-08-13 13:40:26 +0000
@@ -4804,6 +4804,8 @@
     DBUG_RETURN(error);
   if (unlikely(error= binlog_log_row(table, 0, buf, log_func)))
     DBUG_RETURN(error); /* purecov: inspected */
+
+  DEBUG_SYNC_C("ha_write_row_end");
   DBUG_RETURN(0);
 }
 

=== modified file 'Percona-Server/sql/sql_insert.cc'
--- Percona-Server/sql/sql_insert.cc	2012-02-07 03:25:46 +0000
+++ Percona-Server/sql/sql_insert.cc	2012-08-13 13:40:26 +0000
@@ -282,7 +282,7 @@
 
 
 /*
-  Check update fields for the timestamp field.
+  Check update fields for the timestamp and auto_increment fields.
 
   SYNOPSIS
     check_update_fields()
@@ -295,6 +295,9 @@
     If the update fields include the timestamp field,
     remove TIMESTAMP_AUTO_SET_ON_UPDATE from table->timestamp_field_type.
 
+   If the update fields include an autoinc field, set the
+   table->next_number_field_updated flag.
+
   RETURN
     0           OK
     -1          Error
@@ -305,6 +308,7 @@
 {
   TABLE *table= insert_table_list->table;
   my_bool timestamp_mark= 0;
+  my_bool autoinc_mark= FALSE;
 
   if (table->timestamp_field)
   {
@@ -316,6 +320,15 @@
                                           table->timestamp_field->field_index);
   }
 
+  table->next_number_field_updated= FALSE;
+
+  if (table->found_next_number_field)
+  {
+    autoinc_mark=
+      bitmap_test_and_clear(table->write_set,
+                            table->found_next_number_field->field_index);
+  }
+
   /* Check the fields we are going to modify */
   if (setup_fields(thd, 0, update_fields, MARK_COLUMNS_WRITE, 0, 0))
     return -1;
@@ -335,6 +348,18 @@
       bitmap_set_bit(table->write_set,
                      table->timestamp_field->field_index);
   }
+
+  if (table->found_next_number_field)
+  {
+    if (bitmap_is_set(table->write_set,
+                      table->found_next_number_field->field_index))
+      table->next_number_field_updated= TRUE;
+
+    if (autoinc_mark)
+      bitmap_set_bit(table->write_set,
+                     table->found_next_number_field->field_index);
+  }
+
   return 0;
 }
 
@@ -1371,6 +1396,7 @@
   MY_BITMAP *save_read_set, *save_write_set;
   ulonglong prev_insert_id= table->file->next_insert_id;
   ulonglong insert_id_for_cur_row= 0;
+  ulonglong prev_insert_id_for_cur_row= 0;
   DBUG_ENTER("write_record");
 
   info->records++;
@@ -1514,6 +1540,7 @@
             Except if LAST_INSERT_ID(#) was in the INSERT query, which is
             handled separately by THD::arg_of_last_insert_id_function.
           */
+          prev_insert_id_for_cur_row= table->file->insert_id_for_cur_row;
           insert_id_for_cur_row= table->file->insert_id_for_cur_row= 0;
           trg_error= (table->triggers &&
                       table->triggers->process_triggers(thd, TRG_EVENT_UPDATE,
@@ -1521,9 +1548,24 @@
           info->copied++;
         }
 
-        if (table->next_number_field)
+        /*
+          Only update next_insert_id if the AUTO_INCREMENT value was explicitly
+          updated, so we don't update next_insert_id with the value from the row
+          being updated. Otherwise reset next_insert_id to what it was before
+          the duplicate key error, since that value is unused.
+        */
+        if (table->next_number_field_updated)
+        {
+          DBUG_ASSERT(table->next_number_field != NULL);
+
           table->file->adjust_next_insert_id_after_explicit_value(
             table->next_number_field->val_int());
+        }
+        else
+        {
+          table->file->restore_auto_increment(prev_insert_id_for_cur_row);
+        }
+
         info->touched++;
 
         goto ok_or_after_trg_err;

=== modified file 'Percona-Server/sql/sql_parse.cc'
--- Percona-Server/sql/sql_parse.cc	2012-05-09 04:14:12 +0000
+++ Percona-Server/sql/sql_parse.cc	2012-08-13 13:40:26 +0000
@@ -3449,6 +3449,7 @@
                       DBUG_ASSERT(!debug_sync_set_action(current_thd,
                                                          STRING_WITH_LEN(act)));
                     };);
+    DEBUG_SYNC(thd, "after_mysql_insert");
     break;
   }
   case SQLCOM_REPLACE_SELECT:

=== modified file 'Percona-Server/sql/table.h'
--- Percona-Server/sql/table.h	2012-04-02 02:09:15 +0000
+++ Percona-Server/sql/table.h	2012-08-13 13:40:26 +0000
@@ -696,6 +696,11 @@
 
   Field *next_number_field;		/* Set if next_number is activated */
   Field *found_next_number_field;	/* Set on open */
+  /*
+    Set if next_number_field is in the UPDATE fields of INSERT ... ON DUPLICATE
+    KEY UPDATE.
+  */
+  my_bool next_number_field_updated;
   Field_timestamp *timestamp_field;
 
   /* Table's triggers, 0 if there are no of them */