Merge bk-internal.mysql.com:/home/bk/mysql-5.0

into neptunus.(none):/home/msvensson/mysql/mysql-5.0

mysql-test/r/ndb_alter_table.result

@@ -179,7 +179,7 @@ a	b	c
 2	two	two
 alter table t1 drop index c;
 select * from t1 where b = 'two';
-ERROR 42S02: Table 'test.t1' doesn't exist
+ERROR HY000: Table definition has changed, please retry transaction
 select * from t1 where b = 'two';
 a	b	c
 2	two	two

mysql-test/r/ndb_multi.result

@@ -47,3 +47,4 @@ t2
 t3
 t4
 drop table t1, t2, t3, t4;
+drop table t1, t3, t4;