wl#9048: Add "ORDER BY" and "--sorted_result" in suite/gcol as needed for tests have repeatable results in NDB.

Author: jdduncan

mysql-test/suite/gcol/inc/gcol_column_def_options.inc

@@ -246,15 +246,15 @@ CREATE TABLE t1(a int, b int as (a + 1),
             c varchar(12) as ("aaaabb") stored, d blob as (c));
 INSERT INTO t1(a) VALUES(1),(3);
 SHOW CREATE TABLE t1;
-SELECT * FROM t1;
+SELECT * FROM t1 order by a;
 CREATE TABLE t2 LIKE t1;
 SHOW CREATE TABLE t2;
 CREATE TABLE t3 AS SELECT * FROM t1;
 SHOW CREATE TABLE t3;
-SELECT * FROM t3;
+SELECT * FROM t3 order by a;
 CREATE TABLE t4 AS SELECT b,c,d FROM t1;
 SHOW CREATE TABLE t4;
-SELECT * FROM t4;
+SELECT * FROM t4 order by b;
 DROP TABLE t1,t2,t3,t4;
 
 --echo # Bug#21025003:WL8149:ASSERTION `CTX->NUM_TO_DROP_FK
@@ -378,12 +378,13 @@ CREATE TABLE t1 (c CHAR(10) CHARSET latin1 COLLATE latin1_bin,
                  c_ci CHAR(10) CHARSET latin1 COLLATE latin1_general_ci GENERATED ALWAYS AS (c),
                  c_cs CHAR(10) CHARSET latin1 COLLATE latin1_general_cs GENERATED ALWAYS AS (c));
 
-INSERT INTO t1 (c) VALUES ('a'), ('A');
+INSERT INTO t1 (c) VALUES ('a'), ('A'), ('b');
 
 SELECT * FROM t1 ORDER BY c;
-SELECT * FROM t1 ORDER BY c_ci;
+SELECT * FROM t1 ORDER BY c_ci, c;
 SELECT * FROM t1 ORDER BY c_cs;
 
+--sorted_result
 SELECT c, c_ci REGEXP 'A', c_cs REGEXP 'A' FROM t1;
 
 DROP TABLE t1;
@@ -472,15 +473,15 @@ CREATE TABLE t1(
 INSERT INTO t1(col1, col2, col3) VALUES
  (1, 10, 100), (2, 20, 200);
 
-SELECT * FROM t1;
+SELECT * FROM t1 order by col1;
 
 # Change expression of a virtual generated column
 ALTER TABLE t1 MODIFY COLUMN vgc1 INTEGER AS (col2 * col3) VIRTUAL;
-SELECT * FROM t1;
+SELECT * FROM t1 order by col1;
 
 # Change expression of a stored generated column
 ALTER TABLE t1 MODIFY COLUMN sgc1 INTEGER AS (col2 / col3) STORED;
-SELECT * FROM t1;
+SELECT * FROM t1 order by col1;
 
 ALTER TABLE t1 MODIFY COLUMN vgc1 INTEGER AS (col2 + col3) VIRTUAL;
 ALTER TABLE t1 MODIFY COLUMN sgc1 INTEGER AS (col2 - col3) STORED;
@@ -495,13 +496,13 @@ if ($support_virtual_index)
 {
 # Change expression of a virtual generated column, with index
 ALTER TABLE t1 MODIFY COLUMN vgc1 INTEGER AS (col2 * col3) VIRTUAL;
-SELECT * FROM t1;
-SELECT vgc1 FROM t1;
+SELECT * FROM t1 order by col1;
+SELECT vgc1 FROM t1 order by vgc1;
 }
 
 # Change expression of a stored generated column, with index
 ALTER TABLE t1 MODIFY COLUMN sgc1 INTEGER AS (col2 / col3) STORED;
-SELECT * FROM t1;
+SELECT * FROM t1 order by col1;
 SELECT sgc1 FROM t1 order by sgc1;
 
 if ($support_virtual_index)

mysql-test/suite/gcol/inc/gcol_keys.inc

@@ -386,14 +386,17 @@ CREATE TABLE t1 (f1 int, gc int AS (f1 + 1) STORED PRIMARY KEY);
 INSERT INTO t1(f1) VALUES (1),(2),(0),(9),(3),(4),(8),(7),(5),(6);
 ANALYZE TABLE t1;
 --echo # Should use index
+--sorted_result
 SELECT * FROM t1 WHERE f1 + 1 > 7;
 EXPLAIN SELECT * FROM t1 WHERE f1 + 1 > 7;
 SELECT * FROM information_schema.OPTIMIZER_TRACE;
 
 SELECT * FROM t1 WHERE f1 + 1 = 7;
 EXPLAIN SELECT * FROM t1 WHERE f1 + 1 = 7;
+--sorted_result
 SELECT * FROM t1 WHERE f1 + 1 IN (7,5);
 EXPLAIN SELECT * FROM t1 WHERE f1 + 1 IN(7,5);
+--sorted_result
 SELECT * FROM t1 WHERE f1 + 1 BETWEEN 5 AND 7;
 EXPLAIN SELECT * FROM t1 WHERE f1 + 1 BETWEEN 5 AND 7;
 
@@ -415,6 +418,7 @@ EXPLAIN SELECT f1 + 1, MAX(GC)
   FROM t1 IGNORE KEY FOR GROUP BY(PRIMARY) GROUP BY f1 + 1;
 
 --echo # Shouldn't use index
+--sorted_result
 SELECT * FROM t1 WHERE f1 + 1 > 7.0;
 EXPLAIN SELECT * FROM t1 WHERE f1 + 1 > 7.0;
 
@@ -437,9 +441,11 @@ INSERT INTO t1(f1) VALUES
  (070707),(080808);
 ANALYZE TABLE t1;
 
+--sorted_result
 SELECT * FROM t1 WHERE f1 + 1 > 070707;
 --echo # INT column & index should be picked
 EXPLAIN SELECT * FROM t1 WHERE f1 + 1 > 070707;
+--sorted_result
 SELECT * FROM t1 WHERE f1 + 1 > CAST(070707 AS DATE);
 --echo # DATE column & index should be picked
 EXPLAIN SELECT * FROM t1 WHERE f1 + 1 > CAST(070707 AS DATE);
@@ -755,18 +761,21 @@ INSERT INTO employees (data) VALUES('{"id": 2, "name": "Joe"}');
 let $query= SELECT * FROM employees WHERE JSON_EXTRACT(data, '\$.name') = 'Jane';
 ANALYZE TABLE employees;
 --eval EXPLAIN $query
+--sorted_result
 --eval $query
 # The index on name1 should not be used, since it contains
 # double-quoted values which don't match the string literal in the
 # predicate. The query used to return zero rows.
 ALTER TABLE employees ADD INDEX name_idx1(name1);
 ANALYZE TABLE employees;
 --eval EXPLAIN $query
+--sorted_result
 --eval $query
 # The index on name2 contains unquoted strings and can be used.
 ALTER TABLE employees ADD INDEX name_idx2(name2);
 ANALYZE TABLE employees;
 --eval EXPLAIN $query
+--sorted_result
 --eval $query
 DROP TABLE employees;
 --echo #

mysql-test/suite/gcol/inc/gcol_select.inc

@@ -69,6 +69,7 @@ eval explain $s;
 
 --echo # select_type=PRIMARY, type=index,ALL
 let $s = select * from t1 where b in (select c from t3);
+--sorted_result
 eval $s;
 eval explain $s;
 
@@ -80,11 +81,13 @@ eval explain $s;
 --echo # select_type=UNION, type=system
 --echo # select_type=UNION RESULT, type=<union1,2>
 let $s = select * from t1 union select * from t2;
+--sorted_result
 eval $s;
 eval explain $s;
 
 --echo # select_type=DERIVED, type=system
 let $s = select * from (select a,b,c from t1) as t11;
+--sorted_result
 eval $s;
 eval explain $s;
 
@@ -116,21 +119,25 @@ eval explain $s;
 --echo ###
 --echo # SELECT * FROM tbl_name WHERE <gcol expr>
 let $s = select * from t3 where c >= -2;
+--sorted_result
 eval $s;
 eval explain $s;
 
 --echo # SELECT * FROM tbl_name WHERE <non-gcol expr>
 let $s = select * from t3 where a between 1 and 2;
+--sorted_result
 eval $s;
 eval explain $s;
 
 --echo # SELECT * FROM tbl_name WHERE <non-indexed gcol expr>
 let $s = select * from t3 where b between -2 and -1;
+--sorted_result
 eval $s;
 eval explain $s;
 
 --echo # SELECT * FROM tbl_name WHERE <indexed gcol expr>
 let $s = select * from t3 where c between -2 and -1;
+--sorted_result
 eval $s;
 eval explain $s;
 
@@ -769,6 +776,7 @@ INSERT INTO cc (
 (1, '2008-01-23', '11:14:24.032949', '2004-10-02 20:31:15.022553', 't');
 SET @save_old_sql_mode= @@sql_mode;
 SET sql_mode="";
+--disable_warnings
 SELECT DISTINCT alias1.col_varchar_key AS field1
 FROM ( cc AS alias1 STRAIGHT_JOIN
       (( cc AS alias2 STRAIGHT_JOIN cc AS alias3 ON
@@ -781,6 +789,7 @@ ORDER BY field1, alias1.col_date_key, field1 ASC, field1 DESC,
         alias1.col_time_key ASC, field1;
 DROP TABLE cc;
 SET sql_mode=@save_old_sql_mode;
+--enable_warnings
 
 --echo #
 --echo # Bug#20797941: WL8149:ASSERTION !TABLE ||
@@ -833,12 +842,14 @@ DROP TABLE t2, t3;
 --echo #
 --echo # Bug#21317507:GC: STORED COLUMN REJECTED, BUT VIRTUAL IS ACCEPTED
 --echo #
+# TODO: Figure out appropriate NDB tests here
 let $innodb_engine = `SELECT @@session.default_storage_engine='innodb'`;
+let $myisam_engine = `SELECT @@session.default_storage_engine='MyISAM'`;
 CREATE TABLE t1(a INT);
 INSERT INTO t1 VALUES(2147483647);
 --error 1221
 ALTER TABLE t1 ADD INDEX idx(a), WITH VALIDATION;
-if (!$innodb_engine)
+if ($myisam_engine)
 {
   --echo Should fail and column shouldn't be added
   --error 1264
@@ -890,7 +901,7 @@ if ($innodb_engine)
 ALTER TABLE t1 CHANGE h i INT AS (a) VIRTUAL, WITHOUT VALIDATION,
   ALGORITHM=INPLACE;
 }
-if (!$innodb_engine)
+if ($myisam_engine)
 {
 --error 1845, 1846
 ALTER TABLE t1 CHANGE h i INT AS (a) VIRTUAL, WITHOUT VALIDATION,
@@ -906,7 +917,7 @@ ALTER TABLE t1 ADD COLUMN c SMALLINT AS (a) VIRTUAL, WITH VALIDATION,
 ALTER TABLE t1 ADD COLUMN d SMALLINT AS (a) VIRTUAL, WITH VALIDATION,
   ALGORITHM=INPLACE, LOCK=EXCLUSIVE;
 --echo Shouldn't fail on Innodb
-if (!$innodb_engine)
+if ($myisam_engine)
 {
   --error 1845, 1846
   ALTER TABLE t1 ADD COLUMN e SMALLINT AS (a) VIRTUAL, WITHOUT VALIDATION,
@@ -988,6 +999,7 @@ SELECT * FROM t1
 WHERE i1 > 41 AND i1 <= 43;
 
 eval EXPLAIN $query1;
+--sorted_result
 eval $query1;
 
 if ($support_virtual_index)
@@ -1002,6 +1014,7 @@ SELECT * FROM t1
 WHERE v1 > 41 AND v1 <= 43;
 
 eval EXPLAIN $query2;
+--sorted_result
 eval $query2;
 
 DROP TABLE t0, t1;
@@ -1083,6 +1096,7 @@ WHERE ( t3.pk IN
 AND t1.i1 <= t3.i2_key;
 
 eval EXPLAIN $query;
+--sorted_result
 eval $query;
 
 --echo #
@@ -1109,6 +1123,7 @@ WHERE ( t3.pk IN
 AND t1.i1 <= t3.i2_key;
 
 eval EXPLAIN $query;
+--sorted_result
 eval $query;
 
 --echo #
@@ -1136,6 +1151,7 @@ WHERE ( t3.pk IN
 AND t1.i1 <= t3.i2_key;
 
 eval EXPLAIN $query;
+--sorted_result
 eval $query;
 
 --echo #
@@ -1173,6 +1189,7 @@ WHERE ( t3.pk IN
 AND t1.i1 <= t3.i2_key;
 
 eval EXPLAIN $query;
+--sorted_result
 eval $query;
 
 --echo #
@@ -1209,6 +1226,7 @@ WHERE ( t3.pk IN
 AND t1.i1 <= t3.i2_key;
 
 eval EXPLAIN $query;
+--sorted_result
 eval $query;
 
 DROP TABLE t1, t2, t3, t4;

mysql-test/suite/gcol/inc/gcol_trigger_sp.inc

@@ -63,10 +63,12 @@ select * from t1;
 select * from t2;
 
 insert into t1 (a) values (10);
+--sorted_result
 select * from t1;
 select * from t2;
 
 insert into t1 (a) values (600);
+--sorted_result
 select * from t1;
 --replace_column 1 <timestamp>
 select * from t2;
@@ -103,7 +105,9 @@ delete from t1;
 
 call p1();
 
+--sorted_result
 select * from t2;
+--sorted_result
 select * from t1;
 
 drop table t1,t2;

mysql-test/suite/gcol/inc/gcol_view.inc

@@ -24,6 +24,7 @@ analyze table t1;
 
 # simple view
 create view v1 (d,e) as select abs(b), abs(c) from t1;
+--sorted_result
 select d,e from v1;
 select is_updatable from information_schema.views where table_name='v1';
 
@@ -65,6 +66,7 @@ create view v1 as select distinct c from t1;
 select * from v1;
 --replace_column 10 X
 explain select * from v1;
+--sorted_result
 select * from t1;
 drop view v1;
 drop table t1;
@@ -139,6 +141,7 @@ create table t2 (a2 int,
 insert into t1 (a1) values (1), (2);
 insert into t2 (a2) values (2), (3);
 create view v1 as select * from t1,t2 union all select * from t1,t2;
+--sorted_result
 select * from v1;
 drop view v1;
 drop table t1, t2;
@@ -175,19 +178,21 @@ create table t1 (a int,
 		 c int generated always as (-a) stored);
 insert into t1 (a) values (1),(1),(2),(2),(3),(3);
 create view v1 as select b from t1;
+--sorted_result
 select distinct b from v1;
-select distinct b from v1 limit 2;
-select distinct b from t1 limit 2;
-prepare stmt1 from "select distinct b from v1 limit 2";
+select distinct b from v1 order by b limit 2;
+select distinct b from t1 order by b limit 2;
+prepare stmt1 from "select distinct b from v1 order by b limit 2";
 execute stmt1;
 execute stmt1;
 deallocate prepare stmt1;
 drop view v1;
 create view v1 as select c from t1;
+--sorted_result
 select distinct c from v1;
-select distinct c from v1 limit 2;
-select distinct c from t1 limit 2;
-prepare stmt1 from "select distinct c from v1 limit 2";
+select distinct c from v1 order by c limit 2;
+select distinct c from t1 order by c limit 2;
+prepare stmt1 from "select distinct c from v1 order by c limit 2";
 execute stmt1;
 execute stmt1;
 deallocate prepare stmt1;
@@ -207,6 +212,7 @@ insert into v1 (a) values (1);
 insert into v1 (a) values (3);
 # simple insert with ignore
 insert ignore into v1 (a) values (2),(3),(0);
+--sorted_result
 select * from t1;
 drop view v1;
 drop table t1;