summaryrefslogtreecommitdiff
path: root/mysql-test/suite/innodb_plugin/t
diff options
context:
space:
mode:
authorVasil Dimov <vasil.dimov@oracle.com>2010-10-15 17:38:39 +0300
committerVasil Dimov <vasil.dimov@oracle.com>2010-10-15 17:38:39 +0300
commit3e56680632c3676d87bdfc8d7ce606770f8a5611 (patch)
treed72338bae729c7af3571bf733d2536298f8cf5d3 /mysql-test/suite/innodb_plugin/t
parent74b42d8daad141cab6bb4933708e990d4b9d5f11 (diff)
parent54c308d37d4c1485cacc204ce845b665dc981579 (diff)
downloadmariadb-git-3e56680632c3676d87bdfc8d7ce606770f8a5611.tar.gz
Merge mysql-5.1-bugteam -> mysql-5.1-innodb
Diffstat (limited to 'mysql-test/suite/innodb_plugin/t')
-rw-r--r--mysql-test/suite/innodb_plugin/t/innodb-autoinc.test12
-rw-r--r--mysql-test/suite/innodb_plugin/t/innodb_bug53756.test4
2 files changed, 14 insertions, 2 deletions
diff --git a/mysql-test/suite/innodb_plugin/t/innodb-autoinc.test b/mysql-test/suite/innodb_plugin/t/innodb-autoinc.test
index 5a83ffe3617..997c503d2d3 100644
--- a/mysql-test/suite/innodb_plugin/t/innodb-autoinc.test
+++ b/mysql-test/suite/innodb_plugin/t/innodb-autoinc.test
@@ -665,6 +665,18 @@ SELECT * FROM t1;
SHOW CREATE TABLE t1;
DROP TABLE t1;
+##
+# 55277: Failing assertion: auto_inc > 0
+#
+DROP TABLE IF EXISTS t1;
+CREATE TABLE t1(c1 BIGINT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY) ENGINE=InnoDB;
+INSERT INTO t1 VALUES (NULL);
+INSERT INTO t1 VALUES (18446744073709551615);
+# Restart the server
+-- source include/restart_mysqld.inc
+SHOW CREATE TABLE t1;
+DROP TABLE t1;
+
#
# restore environment to the state it was before this test execution
#
diff --git a/mysql-test/suite/innodb_plugin/t/innodb_bug53756.test b/mysql-test/suite/innodb_plugin/t/innodb_bug53756.test
index 0623be1d0ae..8c48550a64d 100644
--- a/mysql-test/suite/innodb_plugin/t/innodb_bug53756.test
+++ b/mysql-test/suite/innodb_plugin/t/innodb_bug53756.test
@@ -34,8 +34,8 @@ INSERT INTO bug_53756 VALUES(1, 11), (2, 22), (3, 33), (4, 44);
--echo
--echo # Select a less restrictive isolation level.
# Don't use user variables. They won't survive server crash.
---let $global_isolation= `SELECT @@global.tx_isolation`;
---let $session_isolation= `SELECT @@session.tx_isolation`;
+--let $global_isolation= `SELECT @@global.tx_isolation`
+--let $session_isolation= `SELECT @@session.tx_isolation`
SET GLOBAL TRANSACTION ISOLATION LEVEL READ COMMITTED;
SET SESSION TRANSACTION ISOLATION LEVEL READ COMMITTED;
COMMIT;