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

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


mysql-test/r/ndb_basic.result:
  Auto merged
mysql-test/t/ndb_basic.test:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
BitKeeper/deleted/.del-errmsg.txt~b44a85a177954da0:
  Auto merged

mysql-test/r/ndb_basic.result

@@ -619,12 +619,18 @@ counter	datavalue
 1	newval
 2	newval
 insert into t1 (datavalue) select datavalue from t1 where counter < 100;
+insert into t1 (datavalue) select datavalue from t1 where counter < 100;
 select * from t1 order by counter;
 counter	datavalue
 1	newval
 2	newval
 3	newval
 4	newval
+5	newval
+6	newval
+7	newval
+8	newval
+insert into t1 (datavalue) select datavalue from t1 where counter < 100;
 insert into t1 (datavalue) select datavalue from t1 where counter < 100;
 select * from t1 order by counter;
 counter	datavalue
@@ -632,8 +638,32 @@ counter	datavalue
 2	newval
 3	newval
 4	newval
+5	newval
+6	newval
+7	newval
+8	newval
 35	newval
 36	newval
 37	newval
 38	newval
+39	newval
+40	newval
+41	newval
+42	newval
+43	newval
+44	newval
+45	newval
+46	newval
+47	newval
+48	newval
+49	newval
+50	newval
+51	newval
+52	newval
+53	newval
+54	newval
+55	newval
+56	newval
+57	newval
+58	newval
 drop table t1;

mysql-test/t/ndb_basic.test

@@ -596,9 +596,11 @@ insert into t1 (datavalue) values ('newval');
 insert into t1 (datavalue) values ('newval');
 select * from t1 order by counter;
 insert into t1 (datavalue) select datavalue from t1 where counter < 100;
+insert into t1 (datavalue) select datavalue from t1 where counter < 100;
 select * from t1 order by counter;
 connection con2;
 insert into t1 (datavalue) select datavalue from t1 where counter < 100;
+insert into t1 (datavalue) select datavalue from t1 where counter < 100;
 select * from t1 order by counter;
 
 drop table t1;