summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormskold@mysql.com <>2005-04-08 11:50:01 +0200
committermskold@mysql.com <>2005-04-08 11:50:01 +0200
commit7c38f9d8e755f0fed743e3e42ec0588df3d9c519 (patch)
tree4d03d1545a241231ea30ffdd9d22210b04e8d777
parenteae3f5ba1d866ef38e396f652cb5f0d50f9949ed (diff)
parent817f2c6a137d76421e2b0f17d902a74e801d6187 (diff)
downloadmariadb-git-7c38f9d8e755f0fed743e3e42ec0588df3d9c519.tar.gz
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
-rw-r--r--mysql-test/r/ndb_basic.result30
-rw-r--r--mysql-test/t/ndb_basic.test2
2 files changed, 32 insertions, 0 deletions
diff --git a/mysql-test/r/ndb_basic.result b/mysql-test/r/ndb_basic.result
index e10d7e5a095..6383a636cad 100644
--- a/mysql-test/r/ndb_basic.result
+++ b/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;
diff --git a/mysql-test/t/ndb_basic.test b/mysql-test/t/ndb_basic.test
index 1b4402c5bdd..5dfc2d5ec58 100644
--- a/mysql-test/t/ndb_basic.test
+++ b/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;