diff options
Diffstat (limited to 'mysql-test/suite/gcol/inc')
| -rw-r--r-- | mysql-test/suite/gcol/inc/gcol_keys.inc | 2 | ||||
| -rw-r--r-- | mysql-test/suite/gcol/inc/gcol_select.inc | 12 | ||||
| -rw-r--r-- | mysql-test/suite/gcol/inc/gcol_view.inc | 14 |
3 files changed, 14 insertions, 14 deletions
diff --git a/mysql-test/suite/gcol/inc/gcol_keys.inc b/mysql-test/suite/gcol/inc/gcol_keys.inc index cf0612b0d0c..e5ac0afd92a 100644 --- a/mysql-test/suite/gcol/inc/gcol_keys.inc +++ b/mysql-test/suite/gcol/inc/gcol_keys.inc @@ -203,7 +203,7 @@ INSERT INTO c ( col_time_nokey,col_datetime_nokey,col_varchar_nokey) values ('16:21:18.052408','2001-11-08 21:02:12.009395', 'x'), ('18:56:33.027423','2003-04-01 00:00:00', 'i'); ---replace_column 10 x 11 x +--replace_column 9 x 10 x EXPLAIN SELECT outr.col_time_key AS x FROM c as outr diff --git a/mysql-test/suite/gcol/inc/gcol_select.inc b/mysql-test/suite/gcol/inc/gcol_select.inc index 939d2f64e84..2386c55fdbc 100644 --- a/mysql-test/suite/gcol/inc/gcol_select.inc +++ b/mysql-test/suite/gcol/inc/gcol_select.inc @@ -507,7 +507,7 @@ INSERT /*! IGNORE */ INTO cc ( (6, '2008-10-10', NULL, '2000-05-22 00:00:00', 'i'), (8, '2002-01-19', '05:18:40.006865', '2009-02-12 00:00:00', 'v'); ---replace_column 10 # 11 # +--replace_column 9 # 10 # EXPLAIN SELECT subquery2_t2.col_int_key AS subquery2_field1 FROM (c AS subquery2_t1 RIGHT JOIN @@ -544,10 +544,10 @@ CREATE TABLE cc ( KEY (col_int_key) ); INSERT INTO cc (col_int_nokey) VALUES (0),(1),(7),(0),(4),(5); ---replace_column 10 # 11 # +--replace_column 9 # 10 # EXPLAIN SELECT pk FROM cc WHERE col_int_key > 3; SELECT pk FROM cc WHERE col_int_key > 3; ---replace_column 10 # 11 # +--replace_column 9 # 10 # EXPLAIN SELECT pk FROM cc WHERE col_int_key > 3 ORDER BY 1; SELECT pk FROM cc WHERE col_int_key > 3 ORDER BY 1; DROP TABLE cc; @@ -601,7 +601,7 @@ INSERT INTO a ( ANALYZE TABLE a, c; ---replace_column 10 # +--replace_column 9 # --disable_warnings EXPLAIN SELECT @@ -675,7 +675,7 @@ col_varchar_nokey (5, 'b'),(8,'m'),(7, 'j'),(2, 'v'); ANALYZE TABLE c, cc; ---replace_column 10 # +--replace_column 9 # --disable_warnings let query=SELECT @@ -734,7 +734,7 @@ KEY cover_key1 (col_int, col_varchar_255_utf8_key)); INSERT INTO j(col_int, pk, col_varchar_10_utf8) VALUES(9, 1, '951910400'), (-1934295040, 2, '1235025920'),(-584581120, 3, '-1176633344'),(3, 4, '1074462720'); ---replace_column 10 # +--replace_column 9 # EXPLAIN SELECT col_varchar_255_utf8_key FROM j ORDER BY 1; SELECT col_varchar_255_utf8_key FROM j ORDER BY col_varchar_255_utf8_key; diff --git a/mysql-test/suite/gcol/inc/gcol_view.inc b/mysql-test/suite/gcol/inc/gcol_view.inc index 6f9ce673199..85caa58c400 100644 --- a/mysql-test/suite/gcol/inc/gcol_view.inc +++ b/mysql-test/suite/gcol/inc/gcol_view.inc @@ -29,20 +29,20 @@ select d,e from v1; select is_updatable from information_schema.views where table_name='v1'; # view with different algorithms (explain output differs) ---replace_column 10 X +--replace_column 9 X explain select d,e from v1; create algorithm=temptable view v2 (d,e) as select abs(b), abs(c) from t1; show create view v2; --sorted_result select d,e from v2; ---replace_column 10 X +--replace_column 9 X explain select d,e from v2; # VIEW on VIEW test create view v3 (d,e) as select d*2, e*2 from v1; --sorted_result select * from v3; ---replace_column 10 X +--replace_column 9 X explain select * from v3; drop view v1,v2,v3; @@ -58,7 +58,7 @@ insert into t1 (a) values (1), (2), (3), (1), (2), (3); create view v1 as select distinct b from t1; --sorted_result select * from v1; ---replace_column 10 X +--replace_column 9 X explain select * from v1; --sorted_result select * from t1; @@ -66,7 +66,7 @@ drop view v1; create view v1 as select distinct c from t1; --sorted_result select * from v1; ---replace_column 10 X +--replace_column 9 X explain select * from v1; --sorted_result select * from t1; @@ -82,13 +82,13 @@ create table t1 (a int not null, insert into t1 (a) values (1), (2), (3), (4); create view v1 as select b+1 from t1 order by 1 desc limit 2; select * from v1; ---replace_column 10 X +--replace_column 9 X explain select * from v1; drop view v1; create view v1 as select c+1 from t1 order by 1 desc limit 2; --sorted_result select * from v1; ---replace_column 10 X +--replace_column 9 X explain select * from v1; drop view v1; drop table t1; |