Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new

into mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new

Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
29c66eea · unknown · 44bcc85b · 807a74a3 · 29c66eea · 29c66eea
Commit 29c66eea authored Mar 06, 2006 by unknown
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

mysql-test/r/ndb_multi_row.result mysql-test/r/ndb_multi_row.result +3 -1

mysql-test/t/ndb_multi_row.test mysql-test/t/ndb_multi_row.test +1 -1

No files found.
--- a/mysql-test/r/ndb_multi_row.result
+++ b/mysql-test/r/ndb_multi_row.result
@@ -60,4 +60,6 @@ t2
 t3
 t4
 drop table t1, t2, t3, t4;
-drop table t1, t3, t4;
+drop table if exists t1, t3, t4;
+Warnings:
+Error	155	Table 'test.t3' doesn't exist
--- a/mysql-test/t/ndb_multi_row.test
+++ b/mysql-test/t/ndb_multi_row.test
@@ -71,6 +71,6 @@ show tables;

 drop table t1, t2, t3, t4;
 connection server2;
-drop table t1, t3, t4;
+drop table if exists t1, t3, t4;

 # End of 4.1 tests