diff options
author | Timothy Smith <timothy.smith@sun.com> | 2008-08-20 16:18:33 -0600 |
---|---|---|
committer | Timothy Smith <timothy.smith@sun.com> | 2008-08-20 16:18:33 -0600 |
commit | 9eb2ebd4d1584bc2a297c7172666f9550a0ecfdb (patch) | |
tree | 7b36e428d5318b8a5aab2120ccd83b5a7746aaf4 /mysql-test/t/innodb.test | |
parent | c8fad67da792333af8cbc6b659dffa6d742f35a3 (diff) | |
download | mariadb-git-9eb2ebd4d1584bc2a297c7172666f9550a0ecfdb.tar.gz |
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.
Diffstat (limited to 'mysql-test/t/innodb.test')
-rw-r--r-- | mysql-test/t/innodb.test | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/mysql-test/t/innodb.test b/mysql-test/t/innodb.test index d7c5f00564d..1073f5535df 100644 --- a/mysql-test/t/innodb.test +++ b/mysql-test/t/innodb.test @@ -2458,7 +2458,22 @@ SELECT AUTO_INCREMENT FROM INFORMATION_SCHEMA.TABLES WHERE table_name = 't2'; DROP TABLE t2; DROP TABLE t1; # End 34920 test +# Bug #29507 TRUNCATE shows to many rows effected +# +CONNECTION default; +CREATE TABLE t1 (c1 int default NULL, + c2 int default NULL +) ENGINE=InnoDB DEFAULT CHARSET=latin1; + +--enable_info +TRUNCATE TABLE t1; +INSERT INTO t1 VALUES (1, 1), (2, 2), (3, 3), (4, 4), (5, 5); +TRUNCATE TABLE t1; + +--disable_info +DROP TABLE t1; +# ####################################################################### # # # Please, DO NOT TOUCH this file as well as the innodb.result file. # |