diff options
| author | unknown <knielsen@knielsen-hq.org> | 2009-11-30 22:37:27 +0100 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2009-11-30 22:37:27 +0100 |
| commit | 7af12a0d7234777d7dc01ebf114cdfbf09dcd072 (patch) | |
| tree | 4a9d9e50072d36ee917a570f8bf83a0117e971db /mysql-test/r/innodb-index.result | |
| parent | f12371c8601774eba10d42ddaf6399334f3378e1 (diff) | |
| parent | dc51f0e1ebf14233025f2723289d238bf43041cf (diff) | |
| download | mariadb-git-7af12a0d7234777d7dc01ebf114cdfbf09dcd072.tar.gz | |
Merge MySQL 5.1.41 into MariaDB trunk, including a number of after-merge fixes.
Also merge charset patch.
Diffstat (limited to 'mysql-test/r/innodb-index.result')
| -rw-r--r-- | mysql-test/r/innodb-index.result | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mysql-test/r/innodb-index.result b/mysql-test/r/innodb-index.result index dd4f926e524..7c4627ae8b2 100644 --- a/mysql-test/r/innodb-index.result +++ b/mysql-test/r/innodb-index.result @@ -1134,6 +1134,7 @@ t2 CREATE TABLE `t2` ( ) ENGINE=InnoDB DEFAULT CHARSET=latin1 DROP TABLE t2; DROP TABLE t1; +call mtr.add_suppression("InnoDB: insufficient history for index"); CREATE TABLE t1 (a INT, b CHAR(1)) ENGINE=InnoDB; INSERT INTO t1 VALUES (3,'a'),(3,'b'),(1,'c'),(0,'d'),(1,'e'); BEGIN; |