From 3db7442e2855186ba87edf4c33b76b5883ee7ba6 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 15 Sep 2004 14:25:58 +0400 Subject: 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). --- mysql-test/include/ps_query.inc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'mysql-test/include/ps_query.inc') diff --git a/mysql-test/include/ps_query.inc b/mysql-test/include/ps_query.inc index bc5d3eb6ed1..9c80c7a040c 100644 --- a/mysql-test/include/ps_query.inc +++ b/mysql-test/include/ps_query.inc @@ -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; -- cgit v1.2.1