From 3db7442e2855186ba87edf4c33b76b5883ee7ba6 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 15 Sep 2004 14:25:58 +0400 Subject: [PATCH] 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 ++++-- mysql-test/r/ps_2myisam.result | 6 ++++-- mysql-test/r/ps_3innodb.result | 6 ++++-- mysql-test/r/ps_4heap.result | 6 ++++-- mysql-test/r/ps_5merge.result | 12 ++++++++---- mysql-test/r/ps_6bdb.result | 6 ++++-- 6 files changed, 28 insertions(+), 14 deletions(-) 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; diff --git a/mysql-test/r/ps_2myisam.result b/mysql-test/r/ps_2myisam.result index b49eedb4067..ff0b7d65433 100644 --- a/mysql-test/r/ps_2myisam.result +++ b/mysql-test/r/ps_2myisam.result @@ -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 diff --git a/mysql-test/r/ps_3innodb.result b/mysql-test/r/ps_3innodb.result index 3a2708376fa..6e18e3e5ec9 100644 --- a/mysql-test/r/ps_3innodb.result +++ b/mysql-test/r/ps_3innodb.result @@ -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 diff --git a/mysql-test/r/ps_4heap.result b/mysql-test/r/ps_4heap.result index 4228d95677d..13bb3b26311 100644 --- a/mysql-test/r/ps_4heap.result +++ b/mysql-test/r/ps_4heap.result @@ -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 diff --git a/mysql-test/r/ps_5merge.result b/mysql-test/r/ps_5merge.result index 03020ccc0f3..6f8109d64de 100644 --- a/mysql-test/r/ps_5merge.result +++ b/mysql-test/r/ps_5merge.result @@ -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 diff --git a/mysql-test/r/ps_6bdb.result b/mysql-test/r/ps_6bdb.result index b8730cce101..5481ee6b4f2 100644 --- a/mysql-test/r/ps_6bdb.result +++ b/mysql-test/r/ps_6bdb.result @@ -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