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

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

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

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