Merge lp:~stewart/drizzle/bug314570 into lp:~drizzle-trunk/drizzle/development

[Stewart Smith]

update is not changing internal auto increment value

fix innobase plugin so that auto_increment behaviour is the same as MyISAM.

=== modified file 'plugin/innobase/handler/ha_innodb.cc'
--- plugin/innobase/handler/ha_innodb.cc	2010-05-28 17:31:42 +0000
+++ plugin/innobase/handler/ha_innodb.cc	2010-06-02 08:35:39 +0000
@@ -4197,6 +4197,40 @@
 
   ut_a(prebuilt->template_type == ROW_MYSQL_WHOLE_ROW);
 
+  if (table->found_next_number_field)
+  {
+    uint64_t  auto_inc;
+    uint64_t  col_max_value;
+
+    auto_inc = table->found_next_number_field->val_int();
+
+    /* We need the upper limit of the col type to check for
+    whether we update the table autoinc counter or not. */
+    col_max_value = innobase_get_int_col_max_value(
+      table->found_next_number_field);
+
+    uint64_t current_autoinc;
+    ulint error= innobase_get_autoinc(&current_autoinc);
+    if (error == DB_SUCCESS
+        && auto_inc <= col_max_value && auto_inc != 0
+        && auto_inc >= current_autoinc)
+    {
+
+      uint64_t  need;
+      uint64_t  offset;
+
+      offset = prebuilt->autoinc_offset;
+      need = prebuilt->autoinc_increment;
+
+      auto_inc = innobase_next_autoinc(
+        auto_inc, need, offset, col_max_value);
+
+      dict_table_autoinc_update_if_greater(prebuilt->table, auto_inc);
+    }
+
+    dict_table_autoinc_unlock(prebuilt->table);
+  }
+
   innodb_srv_conc_enter_innodb(trx);
 
   error = row_update_for_mysql((byte*) old_row, prebuilt);
 
=== modified file 'tests/r/auto_increment.result'
--- tests/r/auto_increment.result	2010-05-13 05:00:09 +0000
+++ tests/r/auto_increment.result	2010-06-02 08:35:39 +0000
@@ -169,7 +169,7 @@
 201	4
 203	6
 300	7
-205	8
+301	8
 400	9
 0	10
 401	11
@@ -185,7 +185,7 @@
 201	4
 203	6
 300	7
-205	8
+301	8
 400	9
 401	11
 0	12
@@ -202,7 +202,7 @@
 201	4
 203	6
 300	7
-205	8
+301	8
 400	9
 401	11
 403	13
 
=== added file 'tests/r/auto_increment_update.result'
--- tests/r/auto_increment_update.result	1970-01-01 00:00:00 +0000
+++ tests/r/auto_increment_update.result	2010-06-02 08:35:39 +0000
@@ -0,0 +1,5 @@
+create table t1 (a int not null auto_increment primary key, val int);
+insert into t1 (val) values (1);
+update t1 set a=2 where a=1;
+insert into t1 (val) values (1);
+drop table t1;
 
=== modified file 'tests/r/innodb.result'
--- tests/r/innodb.result	2010-05-13 05:00:09 +0000
+++ tests/r/innodb.result	2010-06-02 08:35:39 +0000
@@ -2119,15 +2119,6 @@
 3	1
 4	2
 drop table t1;
-create table t1 (a int not null auto_increment primary key, val int) engine=InnoDB;
-insert into t1 (val) values (1);
-update t1 set a=2 where a=1;
-insert into t1 (val) values (1);
-ERROR 23000: Duplicate entry '2' for key 'PRIMARY'
-select * from t1;
-a	val
-2	1
-drop table t1;
 CREATE TABLE t1 (GRADE DECIMAL(4) NOT NULL, PRIMARY KEY (GRADE)) ENGINE=INNODB;
 INSERT INTO t1 (GRADE) VALUES (151),(252),(343);
 SELECT GRADE  FROM t1 WHERE GRADE > 160 AND GRADE < 300;
 
=== added file 'tests/t/auto_increment_update.test'
--- tests/t/auto_increment_update.test	1970-01-01 00:00:00 +0000
+++ tests/t/auto_increment_update.test	2010-06-02 08:35:39 +0000
@@ -0,0 +1,5 @@
+create table t1 (a int not null auto_increment primary key, val int);
+insert into t1 (val) values (1);
+update t1 set a=2 where a=1;
+insert into t1 (val) values (1);
+drop table t1;
 
=== modified file 'tests/t/innodb.test'
--- tests/t/innodb.test	2010-05-13 05:00:09 +0000
+++ tests/t/innodb.test	2010-06-02 08:35:39 +0000
@@ -1149,18 +1149,6 @@
 drop table t1;
 
 #
-# Test that update does not change internal auto-increment value
-#
-
-create table t1 (a int not null auto_increment primary key, val int) engine=InnoDB;
-insert into t1 (val) values (1);
-update t1 set a=2 where a=1;
-# We should get the following error because InnoDB does not update the counter
---error ER_DUP_ENTRY
-insert into t1 (val) values (1);
-select * from t1;
-drop table t1;
-#
 # Bug #10465
 #