diff options
| author | unknown <knielsen@knielsen-hq.org> | 2009-09-15 08:08:54 +0200 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2009-09-15 08:08:54 +0200 |
| commit | 9ec5b6f4442f573cb1316723868056b90f761a14 (patch) | |
| tree | 64375985baba7fb4a795f5f2f19e3d9fc40f84e4 /mysql-test/include/mix1.inc | |
| parent | 2083b7ddfd85b2bab837b73cb8357afcc2e893d8 (diff) | |
| download | mariadb-git-9ec5b6f4442f573cb1316723868056b90f761a14.tar.gz | |
MySQL 5.1.38 after-merge fixes.
Fix some mistakes in the original merge found during review.
mysql-test/include/concurrent.inc:
Add missing lines mistakenly omitted in merge.
mysql-test/include/mix1.inc:
Revert wrong change done during merge.
mysql-test/include/wait_for_status_var.inc.moved:
Remove file which was accidentally not removed during conflict resolution in merge.
mysql-test/r/innodb_mysql.result:
Revert result file change following fixing root problem in merge.
Diffstat (limited to 'mysql-test/include/mix1.inc')
| -rw-r--r-- | mysql-test/include/mix1.inc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mysql-test/include/mix1.inc b/mysql-test/include/mix1.inc index 53933b56812..6dabe4864a9 100644 --- a/mysql-test/include/mix1.inc +++ b/mysql-test/include/mix1.inc @@ -1509,6 +1509,7 @@ DROP TABLE t1; --echo # SQL_SELECT::test_quick_select --echo # (reproduced only with InnoDB tables) --echo # + eval CREATE TABLE t1 (c1 INT, c2 INT, c3 INT, KEY (c3), KEY (c2, c3)) ENGINE=$engine_type; @@ -1538,7 +1539,7 @@ DROP TABLE t1; eval CREATE TABLE t1 (c1 DECIMAL(12,2), c2 DECIMAL(12,2), c3 DECIMAL(12,2), KEY (c3), KEY (c2, c3)) - ENGINE=innodb; + ENGINE=$engine_type; INSERT INTO t1 VALUES (1,1,1), (1,1,1), (1,1,2), (1,1,1), (1,1,2); SELECT 1 FROM (SELECT COUNT(DISTINCT c1) |