database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

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

Browse Source 
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
This commit is contained in:
unknown
2005-04-08 11:50:01 +02:00
parent a35b19af45 5474a95aa5
commit 317b4074d7
2 changed files with 38 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
mysql-test/r/ndb_basic.result
View File

@ -619,12 +619,6 @@ counter datavalue
1 newval 1 newval
2 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
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; select * from t1 order by counter;
counter datavalue counter datavalue
@ -632,8 +626,44 @@ counter datavalue
2 newval 2 newval
3 newval 3 newval
4 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
1 newval
2 newval
3 newval
4 newval
5 newval
6 newval
7 newval
8 newval
35 newval 35 newval
36 newval 36 newval
37 newval 37 newval
38 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; drop table t1;

2
mysql-test/t/ndb_basic.test
View File

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