summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIgor Babaev <igor@askmonty.org>2011-10-04 08:45:01 -0700
committerIgor Babaev <igor@askmonty.org>2011-10-04 08:45:01 -0700
commit3c3a1fbdcdc71a30717875d7022cbbe2e08f3236 (patch)
tree6c838ec4e5c4d753e215fc30fcb98433b1855b50
parenta55f0cabcb332bd6b52350a0f3a2a24eb3822a73 (diff)
downloadmariadb-git-3c3a1fbdcdc71a30717875d7022cbbe2e08f3236.tar.gz
Made the result test of a test case platform independent.
-rw-r--r--mysql-test/r/join_cache.result4
-rw-r--r--mysql-test/t/join_cache.test2
2 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/r/join_cache.result b/mysql-test/r/join_cache.result
index a22471b5777..707b26a2b27 100644
--- a/mysql-test/r/join_cache.result
+++ b/mysql-test/r/join_cache.result
@@ -4254,7 +4254,7 @@ PRIMARY KEY (pk), INDEX idx1(i), INDEX idx2 (v,i)
INSERT INTO t1 VALUES
(10,8,'v'), (11,8,'f'), (12,5,'v'), (13,8,'s'), (14,8,'a'),
(15,6,'p'), (16,7,'z'), (17,2,'a'), (18,5,'h'), (19,7,'h'),
-(25,3,'m'), (26,5,'z'), (27,9,'n'), (28,1,'d'), (29,107,'a');
+(25,3,'m'), (26,5,'a'), (27,9,'n'), (28,1,'d'), (29,107,'a');
INSERT INTO t1 VALUES
(110,8,'x'), (111,8,'y'), (112,5,'v'), (113,8,'z'), (114,8,'i'),
(115,6,'j'), (116,7,'t'), (117,2,'b'), (118,5,'j'), (119,7,'w'),
@@ -4296,9 +4296,9 @@ GROUP BY t2.v ORDER BY t1.pk,t2.v;
v
h
z
-p
n
v
+p
SET SESSION join_cache_level=6;
EXPLAIN
SELECT t2.v FROM t1, t2, t3
diff --git a/mysql-test/t/join_cache.test b/mysql-test/t/join_cache.test
index 270b712e2d7..591c49e60fd 100644
--- a/mysql-test/t/join_cache.test
+++ b/mysql-test/t/join_cache.test
@@ -2457,7 +2457,7 @@ CREATE TABLE t1 (
INSERT INTO t1 VALUES
(10,8,'v'), (11,8,'f'), (12,5,'v'), (13,8,'s'), (14,8,'a'),
(15,6,'p'), (16,7,'z'), (17,2,'a'), (18,5,'h'), (19,7,'h'),
- (25,3,'m'), (26,5,'z'), (27,9,'n'), (28,1,'d'), (29,107,'a');
+ (25,3,'m'), (26,5,'a'), (27,9,'n'), (28,1,'d'), (29,107,'a');
INSERT INTO t1 VALUES
(110,8,'x'), (111,8,'y'), (112,5,'v'), (113,8,'z'), (114,8,'i'),
(115,6,'j'), (116,7,'t'), (117,2,'b'), (118,5,'j'), (119,7,'w'),