Commit 6559a46a authored by Satya B's avatar Satya B

Applying InnoDB snapshot 5.1-ss6344, part 1. Fixes BUG#49267

Detailed revision comments:

r6306 | calvin | 2009-12-14 15:12:46 +0200 (Mon, 14 Dec 2009) | 5 lines
branches/5.1: fix bug#49267: innodb-autoinc.test fails on windows
because of different case mode

There is no change to the InnoDB code, only to fix test case by
changing "T1" to "t1".
parent 27aba1b5
...@@ -1111,46 +1111,46 @@ c1 c2 ...@@ -1111,46 +1111,46 @@ c1 c2
3 innodb 3 innodb
4 NULL 4 NULL
DROP TABLE t1; DROP TABLE t1;
CREATE TABLE T1 (c1 INT AUTO_INCREMENT, c2 INT, PRIMARY KEY(c1)) AUTO_INCREMENT=10 ENGINE=InnoDB; CREATE TABLE t1 (c1 INT AUTO_INCREMENT, c2 INT, PRIMARY KEY(c1)) AUTO_INCREMENT=10 ENGINE=InnoDB;
CREATE INDEX i1 on T1(c2); CREATE INDEX i1 on t1(c2);
SHOW CREATE TABLE T1; SHOW CREATE TABLE t1;
Table Create Table Table Create Table
T1 CREATE TABLE `T1` ( t1 CREATE TABLE `t1` (
`c1` int(11) NOT NULL AUTO_INCREMENT, `c1` int(11) NOT NULL AUTO_INCREMENT,
`c2` int(11) DEFAULT NULL, `c2` int(11) DEFAULT NULL,
PRIMARY KEY (`c1`), PRIMARY KEY (`c1`),
KEY `i1` (`c2`) KEY `i1` (`c2`)
) ENGINE=InnoDB AUTO_INCREMENT=10 DEFAULT CHARSET=latin1 ) ENGINE=InnoDB AUTO_INCREMENT=10 DEFAULT CHARSET=latin1
INSERT INTO T1 (c2) values (0); INSERT INTO t1 (c2) values (0);
SELECT * FROM T1; SELECT * FROM t1;
c1 c2 c1 c2
10 0 10 0
DROP TABLE T1; DROP TABLE t1;
DROP TABLE IF EXISTS T1; DROP TABLE IF EXISTS t1;
Warnings: Warnings:
Note 1051 Unknown table 'T1' Note 1051 Unknown table 't1'
CREATE TABLE T1(C1 DOUBLE AUTO_INCREMENT KEY, C2 CHAR(10)) ENGINE=InnoDB; CREATE TABLE t1(C1 DOUBLE AUTO_INCREMENT KEY, C2 CHAR(10)) ENGINE=InnoDB;
INSERT INTO T1(C1, C2) VALUES (1, 'innodb'), (3, 'innodb'); INSERT INTO t1(C1, C2) VALUES (1, 'innodb'), (3, 'innodb');
INSERT INTO T1(C2) VALUES ('innodb'); INSERT INTO t1(C2) VALUES ('innodb');
SHOW CREATE TABLE T1; SHOW CREATE TABLE t1;
Table Create Table Table Create Table
T1 CREATE TABLE `T1` ( t1 CREATE TABLE `t1` (
`C1` double NOT NULL AUTO_INCREMENT, `C1` double NOT NULL AUTO_INCREMENT,
`C2` char(10) DEFAULT NULL, `C2` char(10) DEFAULT NULL,
PRIMARY KEY (`C1`) PRIMARY KEY (`C1`)
) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=latin1 ) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=latin1
DROP TABLE T1; DROP TABLE t1;
CREATE TABLE T1(C1 FLOAT AUTO_INCREMENT KEY, C2 CHAR(10)) ENGINE=InnoDB; CREATE TABLE t1(C1 FLOAT AUTO_INCREMENT KEY, C2 CHAR(10)) ENGINE=InnoDB;
INSERT INTO T1(C1, C2) VALUES (1, 'innodb'), (3, 'innodb'); INSERT INTO t1(C1, C2) VALUES (1, 'innodb'), (3, 'innodb');
INSERT INTO T1(C2) VALUES ('innodb'); INSERT INTO t1(C2) VALUES ('innodb');
SHOW CREATE TABLE T1; SHOW CREATE TABLE t1;
Table Create Table Table Create Table
T1 CREATE TABLE `T1` ( t1 CREATE TABLE `t1` (
`C1` float NOT NULL AUTO_INCREMENT, `C1` float NOT NULL AUTO_INCREMENT,
`C2` char(10) DEFAULT NULL, `C2` char(10) DEFAULT NULL,
PRIMARY KEY (`C1`) PRIMARY KEY (`C1`)
) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=latin1 ) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=latin1
DROP TABLE T1; DROP TABLE t1;
DROP TABLE IF EXISTS t1; DROP TABLE IF EXISTS t1;
Warnings: Warnings:
Note 1051 Unknown table 't1' Note 1051 Unknown table 't1'
......
...@@ -614,31 +614,31 @@ DROP TABLE t1; ...@@ -614,31 +614,31 @@ DROP TABLE t1;
# 47125: auto_increment start value is ignored if an index is created # 47125: auto_increment start value is ignored if an index is created
# and engine=innodb # and engine=innodb
# #
CREATE TABLE T1 (c1 INT AUTO_INCREMENT, c2 INT, PRIMARY KEY(c1)) AUTO_INCREMENT=10 ENGINE=InnoDB; CREATE TABLE t1 (c1 INT AUTO_INCREMENT, c2 INT, PRIMARY KEY(c1)) AUTO_INCREMENT=10 ENGINE=InnoDB;
CREATE INDEX i1 on T1(c2); CREATE INDEX i1 on t1(c2);
SHOW CREATE TABLE T1; SHOW CREATE TABLE t1;
INSERT INTO T1 (c2) values (0); INSERT INTO t1 (c2) values (0);
SELECT * FROM T1; SELECT * FROM t1;
DROP TABLE T1; DROP TABLE t1;
## ##
# 49032: Use the correct function to read the AUTOINC column value # 49032: Use the correct function to read the AUTOINC column value
# #
DROP TABLE IF EXISTS T1; DROP TABLE IF EXISTS t1;
CREATE TABLE T1(C1 DOUBLE AUTO_INCREMENT KEY, C2 CHAR(10)) ENGINE=InnoDB; CREATE TABLE t1(C1 DOUBLE AUTO_INCREMENT KEY, C2 CHAR(10)) ENGINE=InnoDB;
INSERT INTO T1(C1, C2) VALUES (1, 'innodb'), (3, 'innodb'); INSERT INTO t1(C1, C2) VALUES (1, 'innodb'), (3, 'innodb');
# Restart the server # Restart the server
-- source include/restart_mysqld.inc -- source include/restart_mysqld.inc
INSERT INTO T1(C2) VALUES ('innodb'); INSERT INTO t1(C2) VALUES ('innodb');
SHOW CREATE TABLE T1; SHOW CREATE TABLE t1;
DROP TABLE T1; DROP TABLE t1;
CREATE TABLE T1(C1 FLOAT AUTO_INCREMENT KEY, C2 CHAR(10)) ENGINE=InnoDB; CREATE TABLE t1(C1 FLOAT AUTO_INCREMENT KEY, C2 CHAR(10)) ENGINE=InnoDB;
INSERT INTO T1(C1, C2) VALUES (1, 'innodb'), (3, 'innodb'); INSERT INTO t1(C1, C2) VALUES (1, 'innodb'), (3, 'innodb');
# Restart the server # Restart the server
-- source include/restart_mysqld.inc -- source include/restart_mysqld.inc
INSERT INTO T1(C2) VALUES ('innodb'); INSERT INTO t1(C2) VALUES ('innodb');
SHOW CREATE TABLE T1; SHOW CREATE TABLE t1;
DROP TABLE T1; DROP TABLE t1;
## ##
# 47720: REPLACE INTO Autoincrement column with negative values # 47720: REPLACE INTO Autoincrement column with negative values
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment