database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-10-28 17:15:19 +03:00
Code Activity

Merge MySQL 5.1.41 into MariaDB trunk, including a number of after-merge fixes.

Browse Source 
Also merge charset patch.
This commit is contained in:
unknown
2009-11-30 22:37:27 +01:00
parent 0df8279c46 4a45829044
commit db260b19e3
570 changed files with 21041 additions and 5483 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mysql-test/r/innodb-index.result
View File

@@ -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;