summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIgor Babaev <igor@askmonty.org>2011-10-04 12:00:55 -0700
committerIgor Babaev <igor@askmonty.org>2011-10-04 12:00:55 -0700
commit1c47e1ca0d9b2753b2f447df9efad2d14fbba74b (patch)
tree343d5ac470e4573ba832e10e743312e944dfb7f7
parent3c3a1fbdcdc71a30717875d7022cbbe2e08f3236 (diff)
downloadmariadb-git-1c47e1ca0d9b2753b2f447df9efad2d14fbba74b.tar.gz
Made the result test of a test case platform independent
(correction for the previous patch).
-rw-r--r--mysql-test/r/join_cache.result8
-rw-r--r--mysql-test/t/join_cache.test2
2 files changed, 5 insertions, 5 deletions
diff --git a/mysql-test/r/join_cache.result b/mysql-test/r/join_cache.result
index 707b26a2b27..039ec061819 100644
--- a/mysql-test/r/join_cache.result
+++ b/mysql-test/r/join_cache.result
@@ -4271,7 +4271,7 @@ INSERT INTO t2 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'),
(20,2,'v'), (21,9,'v'), (22,142,'b'), (23,3,'y'), (24,0,'v'),
-(25,3,'m'), (26,5,'z'), (27,9,'n'), (28,1,'d'), (29,107,'a');
+(25,3,'m'), (26,5,'b'), (27,9,'n'), (28,1,'d'), (29,107,'a');
CREATE TABLE t3 (
pk int NOT NULL, i int NOT NULL, v varchar(1) NOT NULL,
PRIMARY KEY (pk), INDEX idx1(i), INDEX idx2(v,i)
@@ -4294,8 +4294,8 @@ SELECT t2.v FROM t1, t2, t3
WHERE t3.v <> t2.v AND t3.pk = t2.i AND t1.v = t3.v AND t1.pk*2<100
GROUP BY t2.v ORDER BY t1.pk,t2.v;
v
+b
h
-z
n
v
p
@@ -4312,7 +4312,7 @@ SELECT t2.v FROM t1, t2, t3
WHERE t3.v <> t2.v AND t3.pk = t2.i AND t1.v = t3.v AND t1.pk*2<100
GROUP BY t2.v ORDER BY t1.pk,t2.v;
v
-z
+b
h
n
v
@@ -4330,8 +4330,8 @@ SELECT t2.v FROM t1, t2, t3
WHERE t3.v <> t2.v AND t3.pk = t2.i AND t1.v = t3.v AND t1.pk*2<100
GROUP BY t2.v ORDER BY t1.pk,t2.v;
v
+b
h
-z
n
v
p
diff --git a/mysql-test/t/join_cache.test b/mysql-test/t/join_cache.test
index 591c49e60fd..116f19b55eb 100644
--- a/mysql-test/t/join_cache.test
+++ b/mysql-test/t/join_cache.test
@@ -2475,7 +2475,7 @@ INSERT INTO t2 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'),
(20,2,'v'), (21,9,'v'), (22,142,'b'), (23,3,'y'), (24,0,'v'),
- (25,3,'m'), (26,5,'z'), (27,9,'n'), (28,1,'d'), (29,107,'a');
+ (25,3,'m'), (26,5,'b'), (27,9,'n'), (28,1,'d'), (29,107,'a');
CREATE TABLE t3 (
pk int NOT NULL, i int NOT NULL, v varchar(1) NOT NULL,