merge 5.0-opt -> 5.1-opt

252976be · unknown · ebf5585d · 252976be · 252976be
Commit 252976be authored Jul 04, 2007 by unknown
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

mysql-test/include/mix1.inc mysql-test/include/mix1.inc +1 -1

mysql-test/r/innodb_mysql.result mysql-test/r/innodb_mysql.result +1 -1

No files found.
--- a/mysql-test/include/mix1.inc
+++ b/mysql-test/include/mix1.inc
@@ -28,7 +28,7 @@
 eval SET SESSION STORAGE_ENGINE = $engine_type;

 --disable_warnings
-drop table if exists t1,t2,t3,t4,t1m,t1i,t2m,t2i,t4;
+drop table if exists t1,t2,t3,t1m,t1i,t2m,t2i,t4;
 --enable_warnings



--- a/mysql-test/r/innodb_mysql.result
+++ b/mysql-test/r/innodb_mysql.result
 SET SESSION STORAGE_ENGINE = InnoDB;
-drop table if exists t1,t2,t3,t4,t1m,t1i,t2m,t2i,t4;
+drop table if exists t1,t2,t3,t1m,t1i,t2m,t2i,t4;
 create table t1 (
 c_id int(11) not null default '0',
 org_id int(11) default null,