Commit d8aa83b2 authored by Timothy Smith's avatar Timothy Smith
Browse files

Cherry-pick some changes from innodb-5.1-ss2545 snapshot. Includes fixes for 

Bug#37531, Bug#36941, Bug#36941, Bug#36942, Bug#38185.

Also include test case from Bug 34300 which was left out from earlier snapshot
(5.1-ss2387).

Also include fix for Bug #29507, "TRUNCATE shows to many rows effected", since
the fix for Bug 37531 depends on it.
parent 1999186d

mysql-test/r/innodb-autoinc-optimize.result

+1 −0
Original line number Diff line number Diff line
@@ -3,4 +3,5 @@ create table t1(a int not null auto_increment primary key) engine=innodb; 
insert into t1 set a = -1;

optimize table t1;

Table	Op	Msg_type	Msg_text

test.t1	optimize	note	Table does not support optimize, doing recreate + analyze instead

test.t1	optimize	status	OK

mysql-test/r/innodb-autoinc.result

0 → 100644
+171 −0
Original line number Diff line number Diff line 
drop table if exists t1;

CREATE TABLE t1 (c1 BIGINT PRIMARY KEY AUTO_INCREMENT, c2 VARCHAR(10)) ENGINE=InnoDB;

INSERT INTO t1 VALUES (9223372036854775807, null);

INSERT INTO t1 (c2) VALUES ('innodb');

Got one of the listed errors

SELECT * FROM t1;

c1	c2

9223372036854775807	NULL

DROP TABLE t1;

CREATE TABLE t1 (c1 TINYINT PRIMARY KEY AUTO_INCREMENT, c2 VARCHAR(10)) ENGINE=InnoDB;

INSERT INTO t1 VALUES (127, null);

INSERT INTO t1 (c2) VALUES ('innodb');

Got one of the listed errors

SELECT * FROM t1;

c1	c2

127	NULL

DROP TABLE t1;

CREATE TABLE t1 (c1 TINYINT UNSIGNED PRIMARY KEY AUTO_INCREMENT, c2 VARCHAR(10)) ENGINE=InnoDB;

INSERT INTO t1 VALUES (255, null);

INSERT INTO t1 (c2) VALUES ('innodb');

Got one of the listed errors

SELECT * FROM t1;

c1	c2

255	NULL

DROP TABLE t1;

CREATE TABLE t1 (c1 SMALLINT PRIMARY KEY AUTO_INCREMENT, c2 VARCHAR(10)) ENGINE=InnoDB;

INSERT INTO t1 VALUES (32767, null);

INSERT INTO t1 (c2) VALUES ('innodb');

Got one of the listed errors

SELECT * FROM t1;

c1	c2

32767	NULL

DROP TABLE t1;

CREATE TABLE t1 (c1 SMALLINT UNSIGNED PRIMARY KEY AUTO_INCREMENT, c2 VARCHAR(10)) ENGINE=InnoDB;

INSERT INTO t1 VALUES (65535, null);

INSERT INTO t1 (c2) VALUES ('innodb');

Got one of the listed errors

SELECT * FROM t1;

c1	c2

65535	NULL

DROP TABLE t1;

CREATE TABLE t1 (c1 MEDIUMINT PRIMARY KEY AUTO_INCREMENT, c2 VARCHAR(10)) ENGINE=InnoDB;

INSERT INTO t1 VALUES (8388607, null);

INSERT INTO t1 (c2) VALUES ('innodb');

Got one of the listed errors

SELECT * FROM t1;

c1	c2

8388607	NULL

DROP TABLE t1;

CREATE TABLE t1 (c1 MEDIUMINT UNSIGNED PRIMARY KEY AUTO_INCREMENT, c2 VARCHAR(10)) ENGINE=InnoDB;

INSERT INTO t1 VALUES (16777215, null);

INSERT INTO t1 (c2) VALUES ('innodb');

Got one of the listed errors

SELECT * FROM t1;

c1	c2

16777215	NULL

DROP TABLE t1;

CREATE TABLE t1 (c1 INT PRIMARY KEY AUTO_INCREMENT, c2 VARCHAR(10)) ENGINE=InnoDB;

INSERT INTO t1 VALUES (2147483647, null);

INSERT INTO t1 (c2) VALUES ('innodb');

Got one of the listed errors

SELECT * FROM t1;

c1	c2

2147483647	NULL

DROP TABLE t1;

CREATE TABLE t1 (c1 INT UNSIGNED PRIMARY KEY AUTO_INCREMENT, c2 VARCHAR(10)) ENGINE=InnoDB;

INSERT INTO t1 VALUES (4294967295, null);

INSERT INTO t1 (c2) VALUES ('innodb');

Got one of the listed errors

SELECT * FROM t1;

c1	c2

4294967295	NULL

DROP TABLE t1;

CREATE TABLE t1 (c1 BIGINT PRIMARY KEY AUTO_INCREMENT, c2 VARCHAR(10)) ENGINE=InnoDB;

INSERT INTO t1 VALUES (9223372036854775807, null);

INSERT INTO t1 (c2) VALUES ('innodb');

Got one of the listed errors

SELECT * FROM t1;

c1	c2

9223372036854775807	NULL

DROP TABLE t1;

CREATE TABLE t1 (c1 BIGINT UNSIGNED PRIMARY KEY AUTO_INCREMENT, c2 VARCHAR(10)) ENGINE=InnoDB;

INSERT INTO t1 VALUES (18446744073709551615, null);

INSERT INTO t1 (c2) VALUES ('innodb');

Got one of the listed errors

SELECT * FROM t1;

c1	c2

18446744073709551615	NULL

DROP TABLE t1;

CREATE TABLE t1(c1 INT PRIMARY KEY AUTO_INCREMENT) ENGINE=InnoDB;

INSERT INTO t1 VALUES (1), (2), (3);

INSERT INTO t1 VALUES (NULL), (NULL), (NULL);

SELECT c1 FROM t1;

c1

1

2

3

4

5

6

SHOW CREATE TABLE t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `c1` int(11) NOT NULL AUTO_INCREMENT,

  PRIMARY KEY (`c1`)

) ENGINE=InnoDB AUTO_INCREMENT=7 DEFAULT CHARSET=latin1

TRUNCATE TABLE t1;

SHOW CREATE TABLE t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `c1` int(11) NOT NULL AUTO_INCREMENT,

  PRIMARY KEY (`c1`)

) ENGINE=InnoDB DEFAULT CHARSET=latin1

INSERT INTO t1 VALUES (1), (2), (3);

INSERT INTO t1 VALUES (NULL), (NULL), (NULL);

SELECT c1 FROM t1;

c1

1

2

3

4

5

6

SHOW CREATE TABLE t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `c1` int(11) NOT NULL AUTO_INCREMENT,

  PRIMARY KEY (`c1`)

) ENGINE=InnoDB AUTO_INCREMENT=7 DEFAULT CHARSET=latin1

DROP TABLE t1;

CREATE TABLE t1(c1 INT PRIMARY KEY AUTO_INCREMENT) ENGINE=InnoDB;

INSERT INTO t1 VALUES (1), (2), (3);

INSERT INTO t1 VALUES (NULL), (NULL), (NULL);

SELECT c1 FROM t1;

c1

1

2

3

4

5

6

SHOW CREATE TABLE t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `c1` int(11) NOT NULL AUTO_INCREMENT,

  PRIMARY KEY (`c1`)

) ENGINE=InnoDB AUTO_INCREMENT=7 DEFAULT CHARSET=latin1

DELETE FROM t1;

SHOW CREATE TABLE t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `c1` int(11) NOT NULL AUTO_INCREMENT,

  PRIMARY KEY (`c1`)

) ENGINE=InnoDB AUTO_INCREMENT=7 DEFAULT CHARSET=latin1

INSERT INTO t1 VALUES (1), (2), (3);

INSERT INTO t1 VALUES (NULL), (NULL), (NULL);

SELECT c1 FROM t1;

c1

1

2

3

7

8

9

SHOW CREATE TABLE t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `c1` int(11) NOT NULL AUTO_INCREMENT,

  PRIMARY KEY (`c1`)

) ENGINE=InnoDB AUTO_INCREMENT=10 DEFAULT CHARSET=latin1

DROP TABLE t1;

mysql-test/r/innodb.result

+11 −0
Original line number Diff line number Diff line
@@ -3267,3 +3267,14 @@ AUTO_INCREMENT 
200

DROP TABLE t2;

DROP TABLE t1;

CREATE TABLE t1 (c1 int default NULL,

c2 int default NULL

) ENGINE=InnoDB DEFAULT CHARSET=latin1;

TRUNCATE TABLE t1;

affected rows: 0

INSERT INTO t1 VALUES (1, 1), (2, 2), (3, 3), (4, 4), (5, 5);

affected rows: 5

info: Records: 5  Duplicates: 0  Warnings: 0

TRUNCATE TABLE t1;

affected rows: 0

DROP TABLE t1;

mysql-test/r/innodb_bug34300.result

0 → 100644
+4 −0
Original line number Diff line number Diff line 
f4	f8

xxx	zzz

f4	f8

xxx	zzz

mysql-test/t/innodb-autoinc.test

0 → 100644
+141 −0
Original line number Diff line number Diff line 
-- source include/have_innodb.inc

# embedded server ignores 'delayed', so skip this

-- source include/not_embedded.inc



--disable_warnings

drop table if exists t1;

--enable_warnings



#

# Bug #34335

#

CREATE TABLE t1 (c1 BIGINT PRIMARY KEY AUTO_INCREMENT, c2 VARCHAR(10)) ENGINE=InnoDB;

INSERT INTO t1 VALUES (9223372036854775807, null);

-- error ER_DUP_ENTRY,1062

INSERT INTO t1 (c2) VALUES ('innodb');

SELECT * FROM t1;

DROP TABLE t1;

#

## Test AUTOINC overflow

##



# TINYINT

CREATE TABLE t1 (c1 TINYINT PRIMARY KEY AUTO_INCREMENT, c2 VARCHAR(10)) ENGINE=InnoDB;

INSERT INTO t1 VALUES (127, null);

-- error ER_DUP_ENTRY,1062

-- warning ER_WARN_DATA_OUT_OF_RANGE,1264

INSERT INTO t1 (c2) VALUES ('innodb');

SELECT * FROM t1;

DROP TABLE t1;



CREATE TABLE t1 (c1 TINYINT UNSIGNED PRIMARY KEY AUTO_INCREMENT, c2 VARCHAR(10)) ENGINE=InnoDB;

INSERT INTO t1 VALUES (255, null);

-- error ER_DUP_ENTRY,1062

-- warning ER_WARN_DATA_OUT_OF_RANGE,1264

INSERT INTO t1 (c2) VALUES ('innodb');

SELECT * FROM t1;

DROP TABLE t1;

#

# SMALLINT

#

CREATE TABLE t1 (c1 SMALLINT PRIMARY KEY AUTO_INCREMENT, c2 VARCHAR(10)) ENGINE=InnoDB;

INSERT INTO t1 VALUES (32767, null);

-- error ER_DUP_ENTRY,1062

-- warning ER_WARN_DATA_OUT_OF_RANGE,1264

INSERT INTO t1 (c2) VALUES ('innodb');

SELECT * FROM t1;

DROP TABLE t1;



CREATE TABLE t1 (c1 SMALLINT UNSIGNED PRIMARY KEY AUTO_INCREMENT, c2 VARCHAR(10)) ENGINE=InnoDB;

INSERT INTO t1 VALUES (65535, null);

-- error ER_DUP_ENTRY,1062

-- warning ER_WARN_DATA_OUT_OF_RANGE,1264

INSERT INTO t1 (c2) VALUES ('innodb');

SELECT * FROM t1;

DROP TABLE t1;

#

# MEDIUMINT

#

CREATE TABLE t1 (c1 MEDIUMINT PRIMARY KEY AUTO_INCREMENT, c2 VARCHAR(10)) ENGINE=InnoDB;

INSERT INTO t1 VALUES (8388607, null);

-- error ER_DUP_ENTRY,1062

-- warning ER_WARN_DATA_OUT_OF_RANGE,1264

INSERT INTO t1 (c2) VALUES ('innodb');

SELECT * FROM t1;

DROP TABLE t1;



CREATE TABLE t1 (c1 MEDIUMINT UNSIGNED PRIMARY KEY AUTO_INCREMENT, c2 VARCHAR(10)) ENGINE=InnoDB;

INSERT INTO t1 VALUES (16777215, null);

-- error ER_DUP_ENTRY,1062

-- warning ER_WARN_DATA_OUT_OF_RANGE,1264

INSERT INTO t1 (c2) VALUES ('innodb');

SELECT * FROM t1;

DROP TABLE t1;

#

# INT

#

CREATE TABLE t1 (c1 INT PRIMARY KEY AUTO_INCREMENT, c2 VARCHAR(10)) ENGINE=InnoDB;

INSERT INTO t1 VALUES (2147483647, null);

-- error ER_DUP_ENTRY,1062

-- warning ER_WARN_DATA_OUT_OF_RANGE,1264

INSERT INTO t1 (c2) VALUES ('innodb');

SELECT * FROM t1;

DROP TABLE t1;



CREATE TABLE t1 (c1 INT UNSIGNED PRIMARY KEY AUTO_INCREMENT, c2 VARCHAR(10)) ENGINE=InnoDB;

INSERT INTO t1 VALUES (4294967295, null);

-- error ER_DUP_ENTRY,1062

INSERT INTO t1 (c2) VALUES ('innodb');

SELECT * FROM t1;

DROP TABLE t1;

#

# BIGINT

#

CREATE TABLE t1 (c1 BIGINT PRIMARY KEY AUTO_INCREMENT, c2 VARCHAR(10)) ENGINE=InnoDB;

INSERT INTO t1 VALUES (9223372036854775807, null);

-- error ER_DUP_ENTRY,1062

-- warning ER_WARN_DATA_OUT_OF_RANGE,1264

INSERT INTO t1 (c2) VALUES ('innodb');

SELECT * FROM t1;

DROP TABLE t1;



CREATE TABLE t1 (c1 BIGINT UNSIGNED PRIMARY KEY AUTO_INCREMENT, c2 VARCHAR(10)) ENGINE=InnoDB;

INSERT INTO t1 VALUES (18446744073709551615, null);

-- error ER_AUTOINC_READ_FAILED,1467

INSERT INTO t1 (c2) VALUES ('innodb');

SELECT * FROM t1;

DROP TABLE t1;



#

# Bug 37531

# After truncate, auto_increment behaves incorrectly for InnoDB

#

CREATE TABLE t1(c1 INT PRIMARY KEY AUTO_INCREMENT) ENGINE=InnoDB;

INSERT INTO t1 VALUES (1), (2), (3);

INSERT INTO t1 VALUES (NULL), (NULL), (NULL);

SELECT c1 FROM t1;

SHOW CREATE TABLE t1;

TRUNCATE TABLE t1;

SHOW CREATE TABLE t1;

INSERT INTO t1 VALUES (1), (2), (3);

INSERT INTO t1 VALUES (NULL), (NULL), (NULL);

SELECT c1 FROM t1;

SHOW CREATE TABLE t1;

DROP TABLE t1;



#

# Deleting all records should not reset the AUTOINC counter.

#

CREATE TABLE t1(c1 INT PRIMARY KEY AUTO_INCREMENT) ENGINE=InnoDB;

INSERT INTO t1 VALUES (1), (2), (3);

INSERT INTO t1 VALUES (NULL), (NULL), (NULL);

SELECT c1 FROM t1;

SHOW CREATE TABLE t1;

DELETE FROM t1;

SHOW CREATE TABLE t1;

INSERT INTO t1 VALUES (1), (2), (3);

INSERT INTO t1 VALUES (NULL), (NULL), (NULL);

SELECT c1 FROM t1;

SHOW CREATE TABLE t1;

DROP TABLE t1;