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

These modifications were part of WL#1856 Conversion of client_test.c tests cases to mysqltest if possible

Browse Source 
They are separated from the other WL#1856 stuff, because they improve the behaviour of the current tests.  

Make the result sets (order of rows) more predictable by using ORDER BY.


mysql-test/include/ps_modify.inc:
  Make the result sets more predictable by using ORDER BY
mysql-test/include/ps_modify1.inc:
  Make the result sets more predictable by using ORDER BY
mysql-test/r/ps_2myisam.result:
  updated results
mysql-test/r/ps_3innodb.result:
  updated results
mysql-test/r/ps_4heap.result:
  updated results
mysql-test/r/ps_5merge.result:
  updated results
mysql-test/r/ps_6bdb.result:
  updated results
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
This commit is contained in:
unknown
2004-09-20 13:10:47 +02:00
parent 52683755d3
commit 5a53ee4fc9
8 changed files with 134 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
mysql-test/r/ps_3innodb.result
View File

@ -1016,7 +1016,7 @@ set @arg01=2;
execute stmt1 using @arg00, @arg01;
Warnings:
Warning 1263 Data truncated; NULL supplied to NOT NULL column 'a' at row 1
select a,b from t1;
select a,b from t1 order by a;
a b
0 two
1 one
@ -1024,7 +1024,7 @@ a b
4 four
set @arg00=0;
execute stmt1 using @arg01, @arg00;
select a,b from t1;
select a,b from t1 order by a;
a b
1 one
2 two
@ -1048,7 +1048,7 @@ prepare stmt1 from 'update t1 set a=? where b=?
and a not in (select ? from t2
where b = ? or a = ?)';
execute stmt1 using @arg04, @arg01, @arg02, @arg03, @arg00 ;
select a,b from t1 ;
select a,b from t1 order by a;
a b
1 one
2 two
@ -1142,7 +1142,7 @@ set @arg01=1 ;
prepare stmt1 from 'insert into t1 set a=?, b=''sechs''
on duplicate key update a=a + ?, b=concat(b,''modified'') ';
execute stmt1 using @arg00, @arg01;
select * from t1;
select * from t1 order by a;
a b
0 NULL
1 one
@ -1170,7 +1170,7 @@ set @updated="updated" ;
insert into t1 values(1000,'x1000_1') ;
insert into t1 values(@1000,@x1000_2),(@1000,@x1000_3)
on duplicate key update a = a + @100, b = concat(b,@updated) ;
select a,b from t1 where a >= 1000 ;
select a,b from t1 where a >= 1000 order by a ;
a b
1000 x1000_3
1100 x1000_1updated
@ -1179,14 +1179,14 @@ insert into t1 values(1000,'x1000_1') ;
prepare stmt1 from ' insert into t1 values(?,?),(?,?)
on duplicate key update a = a + ?, b = concat(b,?) ';
execute stmt1 using @1000, @x1000_2, @1000, @x1000_3, @100, @updated ;
select a,b from t1 where a >= 1000 ;
select a,b from t1 where a >= 1000 order by a ;
a b
1000 x1000_3
1100 x1000_1updated
delete from t1 where a >= 1000 ;
insert into t1 values(1000,'x1000_1') ;
execute stmt1 using @1000, @x1000_2, @1100, @x1000_3, @100, @updated ;
select a,b from t1 where a >= 1000 ;
select a,b from t1 where a >= 1000 order by a ;
a b
1200 x1000_1updatedupdated
delete from t1 where a >= 1000 ;
@ -1195,7 +1195,7 @@ ERROR HY000: This command is not supported in the prepared statement protocol ye
set @duplicate='duplicate ' ;
set @1000=1000 ;
set @5=5 ;
select a,b from t1 where a < 5 ;
select a,b from t1 where a < 5 order by a ;
a b
0 NULL
1 one
@ -1206,7 +1206,7 @@ insert into t1 select a + @1000, concat(@duplicate,b) from t1
where a < @5 ;
affected rows: 5
info: Records: 5 Duplicates: 0 Warnings: 0
select a,b from t1 where a >= 1000 ;
select a,b from t1 where a >= 1000 order by a ;
a b
1000 NULL
1001 duplicate one
@ -1219,7 +1219,7 @@ where a < ? ' ;
execute stmt1 using @1000, @duplicate, @5;
affected rows: 5
info: Records: 5 Duplicates: 0 Warnings: 0
select a,b from t1 where a >= 1000 ;
select a,b from t1 where a >= 1000 order by a ;
a b
1000 NULL
1001 duplicate one
@ -1243,7 +1243,7 @@ where (a,b) in ( select sqrt(a+@1)+CAST(@float AS signed),b
from t1);
affected rows: 8
info: Records: 8 Duplicates: 0 Warnings: 0
select a,b from t2;
select a,b from t2 order by a ;
a b
3 duplicate
4 duplicate
@ -1267,7 +1267,7 @@ select b, a + ? from t1
execute stmt1 using @duplicate, @5, @five, @2, @100, @1, @float ;
affected rows: 8
info: Records: 8 Duplicates: 0 Warnings: 0
select a,b from t2;
select a,b from t2 order by a ;
a b
3 duplicate
4 duplicate