diff options
Diffstat (limited to 'mysql-test/suite/parts/r')
5 files changed, 67 insertions, 67 deletions
diff --git a/mysql-test/suite/parts/r/partition_auto_increment_blackhole.result b/mysql-test/suite/parts/r/partition_auto_increment_blackhole.result index 0276385dc29..5632fa8d457 100644 --- a/mysql-test/suite/parts/r/partition_auto_increment_blackhole.result +++ b/mysql-test/suite/parts/r/partition_auto_increment_blackhole.result @@ -125,33 +125,33 @@ CREATE TABLE t1 UNIQUE KEY (a)) ENGINE='Blackhole'; SET LAST_INSERT_ID = 999; -SET INSERT_ID = 0; -INSERT INTO t1 SET a = 1 ON DUPLICATE KEY UPDATE a = NULL; +SET INSERT_ID = 1; +INSERT INTO t1 SET a = 2 ON DUPLICATE KEY UPDATE a = NULL; SELECT LAST_INSERT_ID(); LAST_INSERT_ID() 999 SELECT * FROM t1; a -INSERT INTO t1 SET a = 1 ON DUPLICATE KEY UPDATE a = NULL; +INSERT INTO t1 SET a = 2 ON DUPLICATE KEY UPDATE a = NULL; SELECT LAST_INSERT_ID(); LAST_INSERT_ID() 999 SELECT * FROM t1; a -UPDATE t1 SET a = 1 WHERE a IS NULL; +UPDATE t1 SET a = 2 WHERE a IS NULL; SELECT LAST_INSERT_ID(); LAST_INSERT_ID() 999 SELECT * FROM t1; a -UPDATE t1 SET a = NULL WHERE a = 1; +UPDATE t1 SET a = NULL WHERE a = 2; SELECT LAST_INSERT_ID(); LAST_INSERT_ID() 999 SELECT * FROM t1; a DROP TABLE t1; -SET INSERT_ID = 1; +SET INSERT_ID = 2; # Simple test with NULL CREATE TABLE t1 ( c1 INT NOT NULL AUTO_INCREMENT, @@ -165,7 +165,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`c1`) -) ENGINE=BLACKHOLE AUTO_INCREMENT=2 DEFAULT CHARSET=latin1 +) ENGINE=BLACKHOLE AUTO_INCREMENT=3 DEFAULT CHARSET=latin1 PARTITION BY HASH (`c1`) PARTITIONS 2 SELECT * FROM t1; diff --git a/mysql-test/suite/parts/r/partition_auto_increment_innodb.result b/mysql-test/suite/parts/r/partition_auto_increment_innodb.result index 76f1ddfceae..1e9652ce465 100644 --- a/mysql-test/suite/parts/r/partition_auto_increment_innodb.result +++ b/mysql-test/suite/parts/r/partition_auto_increment_innodb.result @@ -141,29 +141,29 @@ CREATE TABLE t1 UNIQUE KEY (a)) ENGINE='InnoDB'; SET LAST_INSERT_ID = 999; -SET INSERT_ID = 0; -INSERT INTO t1 SET a = 1 ON DUPLICATE KEY UPDATE a = NULL; +SET INSERT_ID = 1; +INSERT INTO t1 SET a = 2 ON DUPLICATE KEY UPDATE a = NULL; SELECT LAST_INSERT_ID(); LAST_INSERT_ID() 999 SELECT * FROM t1; a -1 -INSERT INTO t1 SET a = 1 ON DUPLICATE KEY UPDATE a = NULL; +2 +INSERT INTO t1 SET a = 2 ON DUPLICATE KEY UPDATE a = NULL; SELECT LAST_INSERT_ID(); LAST_INSERT_ID() 999 SELECT * FROM t1; a 0 -UPDATE t1 SET a = 1 WHERE a IS NULL; +UPDATE t1 SET a = 2 WHERE a IS NULL; SELECT LAST_INSERT_ID(); LAST_INSERT_ID() 999 SELECT * FROM t1; a 0 -UPDATE t1 SET a = NULL WHERE a = 1; +UPDATE t1 SET a = NULL WHERE a = 2; SELECT LAST_INSERT_ID(); LAST_INSERT_ID() 999 @@ -171,7 +171,7 @@ SELECT * FROM t1; a 0 DROP TABLE t1; -SET INSERT_ID = 1; +SET INSERT_ID = 2; # Simple test with NULL CREATE TABLE t1 ( c1 INT NOT NULL AUTO_INCREMENT, @@ -185,12 +185,12 @@ Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`c1`) -) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=latin1 +) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=latin1 PARTITION BY HASH (`c1`) PARTITIONS 2 SELECT * FROM t1; c1 -1 +2 DROP TABLE t1; # Test with sql_mode and first insert as 0 CREATE TABLE t1 ( @@ -1071,29 +1071,29 @@ UNIQUE KEY (a)) ENGINE='InnoDB' PARTITION BY KEY(a) PARTITIONS 2; SET LAST_INSERT_ID = 999; -SET INSERT_ID = 0; -INSERT INTO t1 SET a = 1 ON DUPLICATE KEY UPDATE a = NULL; +SET INSERT_ID = 1; +INSERT INTO t1 SET a = 2 ON DUPLICATE KEY UPDATE a = NULL; SELECT LAST_INSERT_ID(); LAST_INSERT_ID() 999 SELECT * FROM t1; a -1 -INSERT INTO t1 SET a = 1 ON DUPLICATE KEY UPDATE a = NULL; +2 +INSERT INTO t1 SET a = 2 ON DUPLICATE KEY UPDATE a = NULL; SELECT LAST_INSERT_ID(); LAST_INSERT_ID() 999 SELECT * FROM t1; a 0 -UPDATE t1 SET a = 1 WHERE a IS NULL; +UPDATE t1 SET a = 2 WHERE a IS NULL; SELECT LAST_INSERT_ID(); LAST_INSERT_ID() 999 SELECT * FROM t1; a 0 -UPDATE t1 SET a = NULL WHERE a = 1; +UPDATE t1 SET a = NULL WHERE a = 2; SELECT LAST_INSERT_ID(); LAST_INSERT_ID() 999 diff --git a/mysql-test/suite/parts/r/partition_auto_increment_maria.result b/mysql-test/suite/parts/r/partition_auto_increment_maria.result index 5a3902475a9..641cb64deaf 100644 --- a/mysql-test/suite/parts/r/partition_auto_increment_maria.result +++ b/mysql-test/suite/parts/r/partition_auto_increment_maria.result @@ -141,29 +141,29 @@ CREATE TABLE t1 UNIQUE KEY (a)) ENGINE='Aria'; SET LAST_INSERT_ID = 999; -SET INSERT_ID = 0; -INSERT INTO t1 SET a = 1 ON DUPLICATE KEY UPDATE a = NULL; +SET INSERT_ID = 1; +INSERT INTO t1 SET a = 2 ON DUPLICATE KEY UPDATE a = NULL; SELECT LAST_INSERT_ID(); LAST_INSERT_ID() 999 SELECT * FROM t1; a -1 -INSERT INTO t1 SET a = 1 ON DUPLICATE KEY UPDATE a = NULL; +2 +INSERT INTO t1 SET a = 2 ON DUPLICATE KEY UPDATE a = NULL; SELECT LAST_INSERT_ID(); LAST_INSERT_ID() 999 SELECT * FROM t1; a 0 -UPDATE t1 SET a = 1 WHERE a IS NULL; +UPDATE t1 SET a = 2 WHERE a IS NULL; SELECT LAST_INSERT_ID(); LAST_INSERT_ID() 999 SELECT * FROM t1; a 0 -UPDATE t1 SET a = NULL WHERE a = 1; +UPDATE t1 SET a = NULL WHERE a = 2; SELECT LAST_INSERT_ID(); LAST_INSERT_ID() 999 @@ -171,7 +171,7 @@ SELECT * FROM t1; a 0 DROP TABLE t1; -SET INSERT_ID = 1; +SET INSERT_ID = 2; # Simple test with NULL CREATE TABLE t1 ( c1 INT NOT NULL AUTO_INCREMENT, @@ -185,12 +185,12 @@ Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`c1`) -) ENGINE=Aria AUTO_INCREMENT=2 DEFAULT CHARSET=latin1 +) ENGINE=Aria AUTO_INCREMENT=3 DEFAULT CHARSET=latin1 PARTITION BY HASH (`c1`) PARTITIONS 2 SELECT * FROM t1; c1 -1 +2 DROP TABLE t1; # Test with sql_mode and first insert as 0 CREATE TABLE t1 ( @@ -1118,29 +1118,29 @@ UNIQUE KEY (a)) ENGINE='Aria' PARTITION BY KEY(a) PARTITIONS 2; SET LAST_INSERT_ID = 999; -SET INSERT_ID = 0; -INSERT INTO t1 SET a = 1 ON DUPLICATE KEY UPDATE a = NULL; +SET INSERT_ID = 1; +INSERT INTO t1 SET a = 2 ON DUPLICATE KEY UPDATE a = NULL; SELECT LAST_INSERT_ID(); LAST_INSERT_ID() 999 SELECT * FROM t1; a -1 -INSERT INTO t1 SET a = 1 ON DUPLICATE KEY UPDATE a = NULL; +2 +INSERT INTO t1 SET a = 2 ON DUPLICATE KEY UPDATE a = NULL; SELECT LAST_INSERT_ID(); LAST_INSERT_ID() 999 SELECT * FROM t1; a 0 -UPDATE t1 SET a = 1 WHERE a IS NULL; +UPDATE t1 SET a = 2 WHERE a IS NULL; SELECT LAST_INSERT_ID(); LAST_INSERT_ID() 999 SELECT * FROM t1; a 0 -UPDATE t1 SET a = NULL WHERE a = 1; +UPDATE t1 SET a = NULL WHERE a = 2; SELECT LAST_INSERT_ID(); LAST_INSERT_ID() 999 diff --git a/mysql-test/suite/parts/r/partition_auto_increment_memory.result b/mysql-test/suite/parts/r/partition_auto_increment_memory.result index c395f8ed0c9..0ca34e3168f 100644 --- a/mysql-test/suite/parts/r/partition_auto_increment_memory.result +++ b/mysql-test/suite/parts/r/partition_auto_increment_memory.result @@ -141,29 +141,29 @@ CREATE TABLE t1 UNIQUE KEY (a)) ENGINE='Memory'; SET LAST_INSERT_ID = 999; -SET INSERT_ID = 0; -INSERT INTO t1 SET a = 1 ON DUPLICATE KEY UPDATE a = NULL; +SET INSERT_ID = 1; +INSERT INTO t1 SET a = 2 ON DUPLICATE KEY UPDATE a = NULL; SELECT LAST_INSERT_ID(); LAST_INSERT_ID() 999 SELECT * FROM t1; a -1 -INSERT INTO t1 SET a = 1 ON DUPLICATE KEY UPDATE a = NULL; +2 +INSERT INTO t1 SET a = 2 ON DUPLICATE KEY UPDATE a = NULL; SELECT LAST_INSERT_ID(); LAST_INSERT_ID() 999 SELECT * FROM t1; a 0 -UPDATE t1 SET a = 1 WHERE a IS NULL; +UPDATE t1 SET a = 2 WHERE a IS NULL; SELECT LAST_INSERT_ID(); LAST_INSERT_ID() 999 SELECT * FROM t1; a 0 -UPDATE t1 SET a = NULL WHERE a = 1; +UPDATE t1 SET a = NULL WHERE a = 2; SELECT LAST_INSERT_ID(); LAST_INSERT_ID() 999 @@ -171,7 +171,7 @@ SELECT * FROM t1; a 0 DROP TABLE t1; -SET INSERT_ID = 1; +SET INSERT_ID = 2; # Simple test with NULL CREATE TABLE t1 ( c1 INT NOT NULL AUTO_INCREMENT, @@ -185,12 +185,12 @@ Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`c1`) -) ENGINE=MEMORY AUTO_INCREMENT=2 DEFAULT CHARSET=latin1 +) ENGINE=MEMORY AUTO_INCREMENT=3 DEFAULT CHARSET=latin1 PARTITION BY HASH (`c1`) PARTITIONS 2 SELECT * FROM t1; c1 -1 +2 DROP TABLE t1; # Test with sql_mode and first insert as 0 CREATE TABLE t1 ( @@ -1099,29 +1099,29 @@ UNIQUE KEY (a)) ENGINE='Memory' PARTITION BY KEY(a) PARTITIONS 2; SET LAST_INSERT_ID = 999; -SET INSERT_ID = 0; -INSERT INTO t1 SET a = 1 ON DUPLICATE KEY UPDATE a = NULL; +SET INSERT_ID = 1; +INSERT INTO t1 SET a = 2 ON DUPLICATE KEY UPDATE a = NULL; SELECT LAST_INSERT_ID(); LAST_INSERT_ID() 999 SELECT * FROM t1; a -1 -INSERT INTO t1 SET a = 1 ON DUPLICATE KEY UPDATE a = NULL; +2 +INSERT INTO t1 SET a = 2 ON DUPLICATE KEY UPDATE a = NULL; SELECT LAST_INSERT_ID(); LAST_INSERT_ID() 999 SELECT * FROM t1; a 0 -UPDATE t1 SET a = 1 WHERE a IS NULL; +UPDATE t1 SET a = 2 WHERE a IS NULL; SELECT LAST_INSERT_ID(); LAST_INSERT_ID() 999 SELECT * FROM t1; a 0 -UPDATE t1 SET a = NULL WHERE a = 1; +UPDATE t1 SET a = NULL WHERE a = 2; SELECT LAST_INSERT_ID(); LAST_INSERT_ID() 999 diff --git a/mysql-test/suite/parts/r/partition_auto_increment_myisam.result b/mysql-test/suite/parts/r/partition_auto_increment_myisam.result index 792423096b5..c0599b58e28 100644 --- a/mysql-test/suite/parts/r/partition_auto_increment_myisam.result +++ b/mysql-test/suite/parts/r/partition_auto_increment_myisam.result @@ -141,29 +141,29 @@ CREATE TABLE t1 UNIQUE KEY (a)) ENGINE='MyISAM'; SET LAST_INSERT_ID = 999; -SET INSERT_ID = 0; -INSERT INTO t1 SET a = 1 ON DUPLICATE KEY UPDATE a = NULL; +SET INSERT_ID = 1; +INSERT INTO t1 SET a = 2 ON DUPLICATE KEY UPDATE a = NULL; SELECT LAST_INSERT_ID(); LAST_INSERT_ID() 999 SELECT * FROM t1; a -1 -INSERT INTO t1 SET a = 1 ON DUPLICATE KEY UPDATE a = NULL; +2 +INSERT INTO t1 SET a = 2 ON DUPLICATE KEY UPDATE a = NULL; SELECT LAST_INSERT_ID(); LAST_INSERT_ID() 999 SELECT * FROM t1; a 0 -UPDATE t1 SET a = 1 WHERE a IS NULL; +UPDATE t1 SET a = 2 WHERE a IS NULL; SELECT LAST_INSERT_ID(); LAST_INSERT_ID() 999 SELECT * FROM t1; a 0 -UPDATE t1 SET a = NULL WHERE a = 1; +UPDATE t1 SET a = NULL WHERE a = 2; SELECT LAST_INSERT_ID(); LAST_INSERT_ID() 999 @@ -171,7 +171,7 @@ SELECT * FROM t1; a 0 DROP TABLE t1; -SET INSERT_ID = 1; +SET INSERT_ID = 2; # Simple test with NULL CREATE TABLE t1 ( c1 INT NOT NULL AUTO_INCREMENT, @@ -185,12 +185,12 @@ Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`c1`) -) ENGINE=MyISAM AUTO_INCREMENT=2 DEFAULT CHARSET=latin1 +) ENGINE=MyISAM AUTO_INCREMENT=3 DEFAULT CHARSET=latin1 PARTITION BY HASH (`c1`) PARTITIONS 2 SELECT * FROM t1; c1 -1 +2 DROP TABLE t1; # Test with sql_mode and first insert as 0 CREATE TABLE t1 ( @@ -1118,29 +1118,29 @@ UNIQUE KEY (a)) ENGINE='MyISAM' PARTITION BY KEY(a) PARTITIONS 2; SET LAST_INSERT_ID = 999; -SET INSERT_ID = 0; -INSERT INTO t1 SET a = 1 ON DUPLICATE KEY UPDATE a = NULL; +SET INSERT_ID = 1; +INSERT INTO t1 SET a = 2 ON DUPLICATE KEY UPDATE a = NULL; SELECT LAST_INSERT_ID(); LAST_INSERT_ID() 999 SELECT * FROM t1; a -1 -INSERT INTO t1 SET a = 1 ON DUPLICATE KEY UPDATE a = NULL; +2 +INSERT INTO t1 SET a = 2 ON DUPLICATE KEY UPDATE a = NULL; SELECT LAST_INSERT_ID(); LAST_INSERT_ID() 999 SELECT * FROM t1; a 0 -UPDATE t1 SET a = 1 WHERE a IS NULL; +UPDATE t1 SET a = 2 WHERE a IS NULL; SELECT LAST_INSERT_ID(); LAST_INSERT_ID() 999 SELECT * FROM t1; a 0 -UPDATE t1 SET a = NULL WHERE a = 1; +UPDATE t1 SET a = NULL WHERE a = 2; SELECT LAST_INSERT_ID(); LAST_INSERT_ID() 999 |