Skip to content
Permalink
Browse files

Revert "MDEV-8827 Duplicate key with auto increment"

This reverts commit ef47b62.
The parent commit 07ba556
which is a backport of
mysql/mysql-server@1198267
fixes the issue differently.
  • Loading branch information...
dr-m committed Jul 23, 2019
1 parent 07ba556 commit 7153e155424de4b42bc0f96ceb6433e4ed1f827a
@@ -567,7 +567,7 @@ Variable_name Value
auto_increment_increment 65535
auto_increment_offset 65535
INSERT INTO t1 VALUES (NULL),(NULL);
ERROR HY000: Failed to read auto-increment value from storage engine
ERROR 22003: Out of range value for column 'c1' at row 1
SELECT * FROM t1;
c1
1
@@ -660,7 +660,7 @@ t2 CREATE TABLE `t2` (
`n` int(10) unsigned NOT NULL,
`o` enum('FALSE','TRUE') DEFAULT NULL,
PRIMARY KEY (`m`)
) ENGINE=InnoDB AUTO_INCREMENT=14 DEFAULT CHARSET=latin1
) ENGINE=InnoDB AUTO_INCREMENT=19 DEFAULT CHARSET=latin1
INSERT INTO t1 (b,c) SELECT n,o FROM t2 ;
SHOW CREATE TABLE t1;
Table Create Table
@@ -349,7 +349,7 @@ INSERT INTO t1 VALUES (18446744073709551610); #-- 2^64 - 2
SELECT * FROM t1;
SET @@SESSION.AUTO_INCREMENT_INCREMENT=1152921504606846976, @@SESSION.AUTO_INCREMENT_OFFSET=1152921504606846976;
SHOW VARIABLES LIKE "%auto_inc%";
--error 1467
--error 167
INSERT INTO t1 VALUES (NULL),(NULL);
SELECT * FROM t1;
DROP TABLE t1;
@@ -1504,11 +1504,10 @@ innobase_next_autoinc(
if (next_value == 0) {
ulonglong next;

if (current >= offset) {
if (current > offset) {
next = (current - offset) / step;
} else {
next = 0;
block -= step;
next = (offset - current) / step;
}

ut_a(max_value > next);
@@ -10530,12 +10529,15 @@ ha_innobase::get_auto_increment(

current = *first_value;

if (prebuilt->autoinc_increment != increment) {
/* If the increment step of the auto increment column
decreases then it is not affecting the immediate
next value in the series. */
if (prebuilt->autoinc_increment > increment) {

current = autoinc - prebuilt->autoinc_increment;

current = innobase_next_autoinc(
current, 1, increment, offset, col_max_value);
current, 1, increment, 1, col_max_value);

dict_table_autoinc_initialize(prebuilt->table, current);

@@ -1774,11 +1774,10 @@ innobase_next_autoinc(
if (next_value == 0) {
ulonglong next;

if (current >= offset) {
if (current > offset) {
next = (current - offset) / step;
} else {
next = 0;
block -= step;
next = (offset - current) / step;
}

ut_a(max_value > next);
@@ -11799,12 +11798,15 @@ ha_innobase::get_auto_increment(

current = *first_value;

if (prebuilt->autoinc_increment != increment) {
/* If the increment step of the auto increment column
decreases then it is not affecting the immediate
next value in the series. */
if (prebuilt->autoinc_increment > increment) {

current = autoinc - prebuilt->autoinc_increment;

current = innobase_next_autoinc(
current, 1, increment, offset, col_max_value);
current, 1, increment, 1, col_max_value);

dict_table_autoinc_initialize(prebuilt->table, current);

0 comments on commit 7153e15

Please sign in to comment.
You can’t perform that action at this time.