Commit 91dd09d9 authored by Michael Widenius's avatar Michael Widenius

Sorted some test results that can be different on different machines


mysql-test/t/subselect_sj2.test:
  Added --sorted_result
parent 2f7e184d
......@@ -963,25 +963,25 @@ WHERE alias2.b = alias1.a
AND ( alias1.b >= alias1.a OR alias2.b = 'z' )
);
a b
j j
v v
b b
c c
m m
m m
d d
d d
d d
y y
t t
s s
r r
b b
x x
e e
g g
j j
m m
m m
p p
q q
r r
s s
t t
v v
w w
e e
x x
y y
# Another testcase, without the VIEW:
CREATE TABLE t2 (a VARCHAR(1), b VARCHAR(1) NOT NULL, KEY(a)) ENGINE=InnoDB;
INSERT INTO t2 SELECT * FROM t1;
......@@ -1003,44 +1003,44 @@ WHERE
alias2.b = alias1.a AND
(alias1.b >= alias1.a OR alias2.b = 'z'));
a b
j j
j j
v v
v v
b b
b b
c c
c c
m m
m m
m m
m m
d d
d d
d d
d d
d d
d d
y y
y y
t t
t t
s s
s s
r r
r r
b b
b b
x x
x x
e e
e e
g g
g g
j j
j j
m m
m m
m m
m m
p p
p p
q q
q q
r r
r r
s s
s s
t t
t t
v v
v v
w w
w w
e e
e e
x x
x x
y y
y y
DROP VIEW v1;
DROP TABLE t1, t2;
# This must be the last in the file:
......
......@@ -977,25 +977,25 @@ WHERE alias2.b = alias1.a
AND ( alias1.b >= alias1.a OR alias2.b = 'z' )
);
a b
j j
v v
b b
c c
m m
m m
d d
d d
d d
y y
t t
s s
r r
b b
x x
e e
g g
j j
m m
m m
p p
q q
r r
s s
t t
v v
w w
e e
x x
y y
# Another testcase, without the VIEW:
CREATE TABLE t2 (a VARCHAR(1), b VARCHAR(1) NOT NULL, KEY(a)) ENGINE=InnoDB;
INSERT INTO t2 SELECT * FROM t1;
......@@ -1017,44 +1017,44 @@ WHERE
alias2.b = alias1.a AND
(alias1.b >= alias1.a OR alias2.b = 'z'));
a b
j j
v v
b b
b b
c c
c c
m m
d d
t t
d d
s s
r r
m m
b b
g g
p p
q q
w w
d d
d d
d d
d d
e e
e e
g g
g g
j j
j j
v v
c c
m m
d d
t t
d d
s s
r r
m m
b b
g g
m m
m m
p p
p p
q q
d d
e e
y y
q q
r r
r r
s s
s s
t t
t t
v v
v v
w w
w w
x x
y y
x x
w w
y y
y y
DROP VIEW v1;
DROP TABLE t1, t2;
# This must be the last in the file:
......
......@@ -965,25 +965,25 @@ WHERE alias2.b = alias1.a
AND ( alias1.b >= alias1.a OR alias2.b = 'z' )
);
a b
j j
v v
b b
c c
m m
m m
d d
d d
d d
y y
t t
s s
r r
b b
x x
e e
g g
j j
m m
m m
p p
q q
r r
s s
t t
v v
w w
e e
x x
y y
# Another testcase, without the VIEW:
CREATE TABLE t2 (a VARCHAR(1), b VARCHAR(1) NOT NULL, KEY(a)) ENGINE=InnoDB;
INSERT INTO t2 SELECT * FROM t1;
......@@ -1005,44 +1005,44 @@ WHERE
alias2.b = alias1.a AND
(alias1.b >= alias1.a OR alias2.b = 'z'));
a b
j j
j j
v v
v v
b b
b b
c c
c c
m m
m m
m m
m m
d d
d d
d d
d d
d d
d d
y y
y y
t t
t t
s s
s s
r r
r r
b b
b b
x x
x x
e e
e e
g g
g g
j j
j j
m m
m m
m m
m m
p p
p p
q q
q q
r r
r r
s s
s s
t t
t t
v v
v v
w w
w w
e e
e e
x x
x x
y y
y y
DROP VIEW v1;
DROP TABLE t1, t2;
# This must be the last in the file:
......
......@@ -1145,6 +1145,7 @@ INSERT INTO t1 VALUES
CREATE ALGORITHM=TEMPTABLE VIEW v1 AS SELECT * FROM t1;
--echo # This query returned 6 rows instead of 19
--sorted_result
SELECT * FROM v1
WHERE ( a, a ) IN (
SELECT alias2.b, alias2.a
......@@ -1164,6 +1165,7 @@ SELECT * FROM t2
alias2.b = alias1.a AND
(alias1.b >= alias1.a OR alias2.b = 'z'));
--sorted_result
SELECT * FROM t2
WHERE (a, a) IN (SELECT alias2.b, alias2.a FROM t1 AS alias1, t1 AS alias2
WHERE
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment