summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorunknown <mskold@mysql.com>2005-04-08 11:39:22 +0200
committerunknown <mskold@mysql.com>2005-04-08 11:39:22 +0200
commit5474a95aa574df8755f88d9c634a1b692ed6f538 (patch)
tree4660f3102fcce4a1996cfa9c23cc23d87d79cb1c /mysql-test
parent22f1d637fdb210eda5eacf68d860f226f8847855 (diff)
parent61fed028ba5278a5c9184d5a752ce021456601d5 (diff)
downloadmariadb-git-5474a95aa574df8755f88d9c634a1b692ed6f538.tar.gz
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
Diffstat (limited to 'mysql-test')
-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 12f9c3742e5..3712fa2b5ca 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 35e1ddc5ebf..66300f61fc3 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;