Adding upstream version 1:10.11.6.upstream/1%10.11.6

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 59 insertions, 0 deletions

diff --git a/mysql-test/suite/engines/funcs/t/sq_row.test b/mysql-test/suite/engines/funcs/t/sq_row.test
new file mode 100644
index 00000000..55714e1a
--- /dev/null
+++ b/mysql-test/suite/engines/funcs/t/sq_row.test
@@ -0,0 +1,59 @@
+--disable_warnings
+DROP TABLE IF EXISTS t1;
+--enable_warnings
+--disable_warnings
+DROP TABLE IF EXISTS t2;
+--enable_warnings
+CREATE TABLE t1 (c1 INT, c2 CHAR(100));
+INSERT INTO t1 VALUES (null,null);
+INSERT INTO t1 VALUES (1,'');
+INSERT INTO t1 VALUES (2,'abcde');
+INSERT INTO t1 VALUES (100,'abcdefghij');
+CREATE TABLE t2 (c1 INT, c2 VARCHAR(100));
+INSERT INTO t2 VALUES (1,'abcde');
+INSERT INTO t2 VALUES (2,'abcde');
+SELECT * FROM t1 WHERE (c1,c2) = (SELECT c1, c2 FROM t2 WHERE c1=2);
+SELECT * FROM t1 WHERE ROW(1,2) = (SELECT c1, c2 FROM t2 WHERE c1=2);
+SELECT * FROM t1 WHERE (c1,c2) = (2,'abcde');
+DROP TABLE t1;
+DROP TABLE t2;
+CREATE TABLE t1 (c1 INT, c2 VARCHAR(100));
+INSERT INTO t1 VALUES (null,null);
+INSERT INTO t1 VALUES (1,'');
+INSERT INTO t1 VALUES (2,'abcde');
+INSERT INTO t1 VALUES (100,'abcdefghij');
+CREATE TABLE t2 (c1 INT, c2 VARCHAR(100));
+INSERT INTO t2 VALUES (1,'abcde');
+INSERT INTO t2 VALUES (2,'abcde');
+SELECT * FROM t1 WHERE (c1,c2) = (SELECT c1, c2 FROM t2 WHERE c1=2);
+SELECT * FROM t1 WHERE ROW(1,2) = (SELECT c1, c2 FROM t2 WHERE c1=2);
+SELECT * FROM t1 WHERE (c1,c2) = (2,'abcde');
+DROP TABLE t1;
+DROP TABLE t2;
+CREATE TABLE t1 (c1 INT, c2 BINARY(100));
+INSERT INTO t1 VALUES (null,null);
+INSERT INTO t1 VALUES (1,'');
+INSERT INTO t1 VALUES (2,'abcde');
+INSERT INTO t1 VALUES (100,'abcdefghij');
+CREATE TABLE t2 (c1 INT, c2 VARCHAR(100));
+INSERT INTO t2 VALUES (1,'abcde');
+INSERT INTO t2 VALUES (2,'abcde');
+SELECT * FROM t1 WHERE (c1,c2) = (SELECT c1, c2 FROM t2 WHERE c1=2);
+SELECT * FROM t1 WHERE ROW(1,2) = (SELECT c1, c2 FROM t2 WHERE c1=2);
+SELECT * FROM t1 WHERE (c1,c2) = (2,'abcde');
+DROP TABLE t1;
+DROP TABLE t2;
+CREATE TABLE t1 (c1 INT, c2 VARBINARY(100));
+INSERT INTO t1 VALUES (null,null);
+INSERT INTO t1 VALUES (1,'');
+INSERT INTO t1 VALUES (2,'abcde');
+INSERT INTO t1 VALUES (100,'abcdefghij');
+CREATE TABLE t2 (c1 INT, c2 VARCHAR(100));
+INSERT INTO t2 VALUES (1,'abcde');
+INSERT INTO t2 VALUES (2,'abcde');
+SELECT * FROM t1 WHERE (c1,c2) = (SELECT c1, c2 FROM t2 WHERE c1=2);
+SELECT * FROM t1 WHERE ROW(1,2) = (SELECT c1, c2 FROM t2 WHERE c1=2);
+SELECT * FROM t1 WHERE (c1,c2) = (2,'abcde');
+DROP TABLE t1;
+DROP TABLE t2;
+