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/r/innodb.result | |
| 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/r/innodb.result')
| -rw-r--r-- | mysql-test/r/innodb.result | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/mysql-test/r/innodb.result b/mysql-test/r/innodb.result index 5249781303a..84760e1720c 100644 --- a/mysql-test/r/innodb.result +++ b/mysql-test/r/innodb.result @@ -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; |