Commit 3db7442e authored by unknown's avatar unknown
Browse files

Fix the test case to make it more predictable (cause: 4.1.5 test failure 

on intelxeon3 (Solaris x86))


mysql-test/r/ps_2myisam.result:
  Test results fixed (order by for a couple of statements in the PS test).
mysql-test/r/ps_3innodb.result:
  Test results fixed (order by for a couple of statements in the PS test).
mysql-test/r/ps_4heap.result:
  Test results fixed (order by for a couple of statements in the PS test).
mysql-test/r/ps_5merge.result:
  Test results fixed (order by for a couple of statements in the PS test).
mysql-test/r/ps_6bdb.result:
  Test results fixed (order by for a couple of statements in the PS test).
parent b8789226

mysql-test/include/ps_query.inc

+4 −2
Original line number Diff line number Diff line
@@ -294,9 +294,11 @@ set @arg00='ABC'; 
set @arg01='two';

set @arg02='one';

select first.a, @arg00, second.a FROM t1 first, t1 second

where @arg01 = first.b or first.a = second.a or second.b = @arg02;

where @arg01 = first.b or first.a = second.a or second.b = @arg02

order by second.a, first.a;

prepare stmt1 from ' select first.a, ?, second.a FROM t1 first, t1 second

                    where ? = first.b or first.a = second.a or second.b = ? ';

                    where ? = first.b or first.a = second.a or second.b = ?

                    order by second.a, first.a';

execute stmt1 using @arg00, @arg01, @arg02;

mysql-test/r/ps_2myisam.result

+4 −2
Original line number Diff line number Diff line
@@ -395,7 +395,8 @@ set @arg00='ABC'; 
set @arg01='two';

set @arg02='one';

select first.a, @arg00, second.a FROM t1 first, t1 second

where @arg01 = first.b or first.a = second.a or second.b = @arg02;

where @arg01 = first.b or first.a = second.a or second.b = @arg02

order by second.a, first.a;

a	@arg00	a

1	ABC	1

2	ABC	1
@@ -407,7 +408,8 @@ a @arg00 a 
2	ABC	4

4	ABC	4

prepare stmt1 from ' select first.a, ?, second.a FROM t1 first, t1 second

                    where ? = first.b or first.a = second.a or second.b = ? ';

                    where ? = first.b or first.a = second.a or second.b = ?

                    order by second.a, first.a';

execute stmt1 using @arg00, @arg01, @arg02;

a	?	a

1	ABC	1

mysql-test/r/ps_3innodb.result

+4 −2
Original line number Diff line number Diff line
@@ -395,7 +395,8 @@ set @arg00='ABC'; 
set @arg01='two';

set @arg02='one';

select first.a, @arg00, second.a FROM t1 first, t1 second

where @arg01 = first.b or first.a = second.a or second.b = @arg02;

where @arg01 = first.b or first.a = second.a or second.b = @arg02

order by second.a, first.a;

a	@arg00	a

1	ABC	1

2	ABC	1
@@ -407,7 +408,8 @@ a @arg00 a 
2	ABC	4

4	ABC	4

prepare stmt1 from ' select first.a, ?, second.a FROM t1 first, t1 second

                    where ? = first.b or first.a = second.a or second.b = ? ';

                    where ? = first.b or first.a = second.a or second.b = ?

                    order by second.a, first.a';

execute stmt1 using @arg00, @arg01, @arg02;

a	?	a

1	ABC	1

mysql-test/r/ps_4heap.result

+4 −2
Original line number Diff line number Diff line
@@ -396,7 +396,8 @@ set @arg00='ABC'; 
set @arg01='two';

set @arg02='one';

select first.a, @arg00, second.a FROM t1 first, t1 second

where @arg01 = first.b or first.a = second.a or second.b = @arg02;

where @arg01 = first.b or first.a = second.a or second.b = @arg02

order by second.a, first.a;

a	@arg00	a

1	ABC	1

2	ABC	1
@@ -408,7 +409,8 @@ a @arg00 a 
2	ABC	4

4	ABC	4

prepare stmt1 from ' select first.a, ?, second.a FROM t1 first, t1 second

                    where ? = first.b or first.a = second.a or second.b = ? ';

                    where ? = first.b or first.a = second.a or second.b = ?

                    order by second.a, first.a';

execute stmt1 using @arg00, @arg01, @arg02;

a	?	a

1	ABC	1

mysql-test/r/ps_5merge.result

+8 −4
Original line number Diff line number Diff line
@@ -438,7 +438,8 @@ set @arg00='ABC'; 
set @arg01='two';

set @arg02='one';

select first.a, @arg00, second.a FROM t1 first, t1 second

where @arg01 = first.b or first.a = second.a or second.b = @arg02;

where @arg01 = first.b or first.a = second.a or second.b = @arg02

order by second.a, first.a;

a	@arg00	a

1	ABC	1

2	ABC	1
@@ -450,7 +451,8 @@ a @arg00 a 
2	ABC	4

4	ABC	4

prepare stmt1 from ' select first.a, ?, second.a FROM t1 first, t1 second

                    where ? = first.b or first.a = second.a or second.b = ? ';

                    where ? = first.b or first.a = second.a or second.b = ?

                    order by second.a, first.a';

execute stmt1 using @arg00, @arg01, @arg02;

a	?	a

1	ABC	1
@@ -1631,7 +1633,8 @@ set @arg00='ABC'; 
set @arg01='two';

set @arg02='one';

select first.a, @arg00, second.a FROM t1 first, t1 second

where @arg01 = first.b or first.a = second.a or second.b = @arg02;

where @arg01 = first.b or first.a = second.a or second.b = @arg02

order by second.a, first.a;

a	@arg00	a

1	ABC	1

2	ABC	1
@@ -1643,7 +1646,8 @@ a @arg00 a 
2	ABC	4

4	ABC	4

prepare stmt1 from ' select first.a, ?, second.a FROM t1 first, t1 second

                    where ? = first.b or first.a = second.a or second.b = ? ';

                    where ? = first.b or first.a = second.a or second.b = ?

                    order by second.a, first.a';

execute stmt1 using @arg00, @arg01, @arg02;

a	?	a

1	ABC	1