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

into mysql.com:/home/my/mysql-4.1


mysql-test/r/ndb_basic.result:
  Auto merged
mysql-test/t/ndb_basic.test:
  Auto merged

1 files changed, 6 insertions, 4 deletions

diff --git a/mysql-test/t/ndb_basic.test b/mysql-test/t/ndb_basic.test
index a3aa042848d..0487e18cdb9 100644
--- a/mysql-test/t/ndb_basic.test
+++ b/mysql-test/t/ndb_basic.test
@@ -206,10 +206,6 @@ select * from t4 where a = 7 and b = 16 order by a;
 select * from t4 where a = 7 and b = 17 order by a;
 select * from t4 where a = 7 and b != 16 order by b;
 
-select x1.a, x1.b from t2 x1, t2 x2 where x1.b = x2.b order by x1.a;
-select a, b FROM t2 outer_table where
-a = (select a from t2 where b = outer_table.b ) order by a;
-
 #
 # update records
 #
@@ -225,6 +221,12 @@ while ($1)
 }
 enable_query_log;
 
+delete from t2 where a > 5;
+select x1.a, x1.b from t2 x1, t2 x2 where x1.b = x2.b order by x1.a;
+select a, b FROM t2 outer_table where
+a = (select a from t2 where b = outer_table.b ) order by a;
+
+
 delete from t2;
 delete from t3;
 delete from t4;