Commit 06f12f66 authored by sergefp@mysql.com's avatar sergefp@mysql.com

Post-merge fixes

parent 6f702a4b
...@@ -195,7 +195,6 @@ KEY `date` (`date`) ...@@ -195,7 +195,6 @@ KEY `date` (`date`)
DELETE FROM t1 ORDER BY date ASC, time ASC LIMIT 1; DELETE FROM t1 ORDER BY date ASC, time ASC LIMIT 1;
drop table t1; drop table t1;
End of 4.1 tests End of 4.1 tests
End of 4.1 tests
CREATE TABLE t1 (a int not null,b int not null); CREATE TABLE t1 (a int not null,b int not null);
CREATE TABLE t2 (a int not null, b int not null, primary key (a,b)); CREATE TABLE t2 (a int not null, b int not null, primary key (a,b));
CREATE TABLE t3 (a int not null, b int not null, primary key (a,b)); CREATE TABLE t3 (a int not null, b int not null, primary key (a,b));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment