Merge mysql.com:/home/alexi/innodb/mysql-4.1-innodb-work

into mysql.com:/home/alexi/innodb/mysql-5.0-ss492-work

Merge mysql.com:/home/alexi/innodb/mysql-4.1-innodb-work
into mysql.com:/home/alexi/innodb/mysql-5.0-ss492-work
6e3a780f · unknown · d763bcfc · a07d3ea2 · 6e3a780f · 6e3a780f
Commit 6e3a780f authored Apr 26, 2006 by unknown
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

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

mysql-test/t/innodb_mysql.test mysql-test/t/innodb_mysql.test +4 -0

No files found.
--- a/mysql-test/r/innodb_mysql.result
+++ b/mysql-test/r/innodb_mysql.result
-
+drop table if exists t1;
--- a/mysql-test/t/innodb_mysql.test
+++ b/mysql-test/t/innodb_mysql.test
 -- source include/have_innodb.inc
+
+--disable_warnings
+drop table if exists t1;
+--enable_warnings