Skip to content

Commit a911fc5

Browse files
jdduncanjdduncan
committed
wl#9048 Changes to mysql-test/suite/gcol/ -- http://rb.no.oracle.com/rb/r/11355/
Update gcol suite for better reuse with NDB
1 parent 98cd821 commit a911fc5

11 files changed

+190
-167
lines changed

‎mysql-test/suite/gcol/inc/gcol_blocked_sql_funcs_main.inc

+1-1
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ create table t1 (a datetime, b datetime generated always as (utc_time()) virtual
8888
create table t1 (a datetime, b datetime generated always as (utc_timestamp()) virtual);
8989

9090
--echo # MATCH()
91-
if (!$skip_full_text_checks)
91+
if (!$skip_full_text_check)
9292
{
9393
-- error ER_GENERATED_COLUMN_FUNCTION_IS_NOT_ALLOWED
9494
create table t1 (a varchar(32), b bool generated always as (match a against ('sample text')) virtual);

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

+4
Original file line numberDiff line numberDiff line change
@@ -332,6 +332,7 @@ CREATE TABLE t2(a int, b int as (1 NOT IN (SELECT 1 FROM t1 WHERE not_exist_col)
332332
CREATE TABLE t2(a int, b int as (1 NOT IN (SELECT 1 FROM dual)));
333333
DROP TABLE t1;
334334

335+
if(! $testing_ndb) {
335336
--echo # Bug#21142905: PARTITIONED GENERATED COLS -
336337
--echo # !TABLE || (!TABLE->WRITE_SET || BITMAP_IS_SET
337338
--echo #
@@ -344,6 +345,7 @@ d int generated always as (b+a) virtual
344345
INSERT INTO t1(a) VALUES(0);
345346
DELETE FROM t1 WHERE c=1;
346347
DROP TABLE t1;
348+
}
347349

348350
--echo # Bug #20709487: COLLATE OPTION NOT ACCEPTED IN GENERATED COLUMN
349351
--echo # DEFINITION
@@ -386,6 +388,7 @@ SELECT c, c_ci REGEXP 'A', c_cs REGEXP 'A' FROM t1;
386388

387389
DROP TABLE t1;
388390

391+
if(! $testing_ndb) {
389392
--echo # Bug #21469535: VALGRIND ERROR (CONDITIONAL JUMP) WHEN INSERT
390393
--echo # ROWS INTO A PARTITIONED TABLE
391394
--echo #
@@ -403,6 +406,7 @@ PARTITION BY RANGE (store_id) (
403406

404407
INSERT INTO t1 VALUES(1, 2, default);
405408
DROP TABLE t1;
409+
}
406410

407411
--echo # Bug#21465626:ASSERT/CRASH ON DROPPING/ADDING VIRTUAL COLUMN
408412
CREATE TABLE t (a int(11), b int(11),

‎mysql-test/suite/gcol/inc/gcol_supported_sql_funcs.inc

+1
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ if ($rows)
4141
eval insert into t1 values ($values4);
4242
dec $rows;
4343
}
44+
--sorted_result
4445
select * from t1;
4546
drop table t1;
4647
set sql_warnings = 0;

‎mysql-test/suite/gcol/inc/gcol_supported_sql_funcs_main.inc

+22-18
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ let $rows = 2;
8888
--source suite/gcol/inc/gcol_supported_sql_funcs.inc
8989

9090
--echo # CRC32()
91-
let $cols = a varchar(10), b long generated always as (crc32(a)) virtual;
91+
let $cols = a varchar(10), b bigint generated always as (crc32(a)) virtual;
9292
let $values1 = 'MySQL',default;
9393
let $values2 = 'mysql',default;
9494
let $rows = 2;
@@ -116,7 +116,7 @@ let $rows = 3;
116116
--source suite/gcol/inc/gcol_supported_sql_funcs.inc
117117

118118
--echo # FLOOR()
119-
let $cols = a double, b long generated always as (floor(a)) virtual;
119+
let $cols = a double, b bigint generated always as (floor(a)) virtual;
120120
let $values1 = 1.23,default;
121121
let $values2 = -1.23,default;
122122
let $rows = 2;
@@ -296,13 +296,13 @@ let $rows = 1;
296296
--source suite/gcol/inc/gcol_supported_sql_funcs.inc
297297

298298
--echo # BIT_LENGTH()
299-
let $cols = a varchar(10), b long generated always as (bit_length(a)) virtual;
299+
let $cols = a varchar(10), b bigint generated always as (bit_length(a)) virtual;
300300
let $values1 = 'text',default;
301301
let $rows = 1;
302302
--source suite/gcol/inc/gcol_supported_sql_funcs.inc
303303

304304
--echo # CHAR_LENGTH()
305-
let $cols = a varchar(10), b long generated always as (char_length(a)) virtual;
305+
let $cols = a varchar(10), b bigint generated always as (char_length(a)) virtual;
306306
let $values1 = 'text',default;
307307
let $rows = 1;
308308
--source suite/gcol/inc/gcol_supported_sql_funcs.inc
@@ -314,7 +314,7 @@ let $rows = 1;
314314
--source suite/gcol/inc/gcol_supported_sql_funcs.inc
315315

316316
--echo # CHARACTER_LENGTH()
317-
let $cols = a varchar(10), b long generated always as (character_length(a)) virtual;
317+
let $cols = a varchar(10), b bigint generated always as (character_length(a)) virtual;
318318
let $values1 = 'text',default;
319319
let $rows = 1;
320320
--source suite/gcol/inc/gcol_supported_sql_funcs.inc
@@ -473,7 +473,7 @@ let $rows = 1;
473473
--source suite/gcol/inc/gcol_supported_sql_funcs.inc
474474

475475
--echo # ORD()
476-
let $cols = a varchar(10), b long generated always as (ord(a)) virtual;
476+
let $cols = a varchar(10), b bigint generated always as (ord(a)) virtual;
477477
let $values1 = '2',default;
478478
let $rows = 1;
479479
--source suite/gcol/inc/gcol_supported_sql_funcs.inc
@@ -867,7 +867,7 @@ let $rows = 1;
867867
--source suite/gcol/inc/gcol_supported_sql_funcs.inc
868868

869869
--echo # DATEDIFF()
870-
let $cols = a datetime, b long generated always as (datediff(a,'2000-01-01')) virtual;
870+
let $cols = a datetime, b bigint generated always as (datediff(a,'2000-01-01')) virtual;
871871
let $values1 = '2008-08-31',default;
872872
let $rows = 1;
873873
--source suite/gcol/inc/gcol_supported_sql_funcs.inc
@@ -909,13 +909,13 @@ let $rows = 1;
909909
--source suite/gcol/inc/gcol_supported_sql_funcs.inc
910910

911911
--echo # FROM_DAYS()
912-
let $cols = a long, b datetime generated always as (from_days(a)) virtual;
912+
let $cols = a bigint, b datetime generated always as (from_days(a)) virtual;
913913
let $values1 = 730669,default;
914914
let $rows = 1;
915915
--source suite/gcol/inc/gcol_supported_sql_funcs.inc
916916

917917
--echo # FROM_UNIXTIME()
918-
let $cols = a long, b datetime generated always as (from_unixtime(a)) virtual;
918+
let $cols = a bigint, b datetime generated always as (from_unixtime(a)) virtual;
919919
let $values1 = 1196440219,default;
920920
let $rows = 1;
921921
--source suite/gcol/inc/gcol_supported_sql_funcs.inc
@@ -927,7 +927,7 @@ let $rows = 1;
927927
--source suite/gcol/inc/gcol_supported_sql_funcs.inc
928928

929929
--echo # HOUR()
930-
let $cols = a time, b long generated always as (hour(a)) virtual;
930+
let $cols = a time, b bigint generated always as (hour(a)) virtual;
931931
let $values1 = '10:05:03',default;
932932
let $rows = 1;
933933
--source suite/gcol/inc/gcol_supported_sql_funcs.inc
@@ -952,7 +952,7 @@ let $rows = 1;
952952
--source suite/gcol/inc/gcol_supported_sql_funcs.inc
953953

954954
--echo # MICROSECOND()
955-
let $cols = a datetime, b long generated always as (microsecond(a)) virtual;
955+
let $cols = a datetime, b bigint generated always as (microsecond(a)) virtual;
956956
let $values1 = '2009-12-31 12:00:00.123456',default;
957957
let $values2 = '2009-12-31 23:59:59.000010',default;
958958
let $rows = 2;
@@ -995,7 +995,7 @@ let $rows = 1;
995995
--source suite/gcol/inc/gcol_supported_sql_funcs.inc
996996

997997
--echo # SEC_TO_TIME()
998-
let $cols = a long, b time generated always as (sec_to_time(a)) virtual;
998+
let $cols = a bigint, b time generated always as (sec_to_time(a)) virtual;
999999
let $values1 = 2378,default;
10001000
let $rows = 1;
10011001
--source suite/gcol/inc/gcol_supported_sql_funcs.inc
@@ -1031,7 +1031,7 @@ let $rows = 1;
10311031
--source suite/gcol/inc/gcol_supported_sql_funcs.inc
10321032

10331033
--echo # TIME_TO_SEC()
1034-
let $cols = a time, b long generated always as (time_to_sec(a)) virtual;
1034+
let $cols = a time, b bigint generated always as (time_to_sec(a)) virtual;
10351035
let $values1 = '22:23:00',default;
10361036
let $rows = 1;
10371037
--source suite/gcol/inc/gcol_supported_sql_funcs.inc
@@ -1043,7 +1043,7 @@ let $rows = 1;
10431043
--source suite/gcol/inc/gcol_supported_sql_funcs.inc
10441044

10451045
--echo # TIMEDIFF()
1046-
let $cols = a datetime, b datetime, c long generated always as (timediff(a,b)) virtual;
1046+
let $cols = a datetime, b datetime, c bigint generated always as (timediff(a,b)) virtual;
10471047
let $values1 = '2008-12-31 23:59:59.000001','2008-12-30 01:01:01.000002',default;
10481048
let $rows = 1;
10491049
--source suite/gcol/inc/gcol_supported_sql_funcs.inc
@@ -1061,13 +1061,13 @@ let $rows = 1;
10611061
--source suite/gcol/inc/gcol_supported_sql_funcs.inc
10621062

10631063
--echo # TIMESTAMPDIFF()
1064-
let $cols = a timestamp, c long generated always as (timestampdiff(MONTH, a, a)) virtual;
1064+
let $cols = a timestamp, c bigint generated always as (timestampdiff(MONTH, a, a)) virtual;
10651065
let $values1 = '2003-02-01',default;
10661066
let $rows = 1;
10671067
--source suite/gcol/inc/gcol_supported_sql_funcs.inc
10681068

10691069
--echo # TO_DAYS()
1070-
let $cols = a datetime, b long generated always as (to_days(a)) virtual;
1070+
let $cols = a datetime, b bigint generated always as (to_days(a)) virtual;
10711071
let $values1 = '2007-10-07',default;
10721072
let $rows = 1;
10731073
--source suite/gcol/inc/gcol_supported_sql_funcs.inc
@@ -1112,14 +1112,14 @@ let $rows = 1;
11121112
--echo #
11131113

11141114
--echo # CAST()
1115-
let $cols = a int, b long generated always as (cast(a as unsigned)) virtual;
1115+
let $cols = a int, b bigint unsigned generated always as (cast(a as unsigned)) virtual;
11161116
let $values1 = 1,default;
11171117
let $values2 = -1,default;
11181118
let $rows = 2;
11191119
--source suite/gcol/inc/gcol_supported_sql_funcs.inc
11201120

11211121
--echo # Convert()
1122-
let $cols = a int, b long generated always as (convert(a,unsigned)) virtual;
1122+
let $cols = a int, b bigint unsigned generated always as (convert(a,unsigned)) virtual;
11231123
let $values1 = 1,default;
11241124
let $values2 = -1,default;
11251125
let $rows = 2;
@@ -1178,12 +1178,14 @@ let $rows = 1;
11781178
--source suite/gcol/inc/gcol_supported_sql_funcs.inc
11791179

11801180
--echo # ENCODE(), DECODE()
1181+
--disable_warnings
11811182
let $cols = a varchar(1024), b varchar(1024) generated always as (decode(encode(a,'abc'),'abc')) virtual;
11821183
let $values1 = 'MySQL',default;
11831184
let $rows = 1;
11841185
--source suite/gcol/inc/gcol_supported_sql_funcs.inc
11851186

11861187
--echo # DEFAULT()
1188+
--enable_warnings
11871189
let $cols = a varchar(1024) default 'aaa', b varchar(1024) generated always as (ifnull(a,default(a))) virtual;
11881190
let $values1 = 'any value',default;
11891191
let $rows = 1;
@@ -1214,12 +1216,14 @@ let $rows = 1;
12141216
--source suite/gcol/inc/gcol_supported_sql_funcs.inc
12151217

12161218
--echo # PASSWORD()
1219+
--disable_warnings
12171220
let $cols = a varchar(1024), b varchar(1024) generated always as (password(a)) virtual;
12181221
let $values1 = 'badpwd',default;
12191222
let $rows = 1;
12201223
--source suite/gcol/inc/gcol_supported_sql_funcs.inc
12211224

12221225
--echo # SHA1()
1226+
--enable_warnings
12231227
let $cols = a varchar(1024), b varchar(1024) generated always as (sha1(a)) virtual;
12241228
let $values1 = 'abc',default;
12251229
let $rows = 1;

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

+7-3
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,14 @@ select is_updatable from information_schema.views where table_name='v1';
3232
explain select d,e from v1;
3333
create algorithm=temptable view v2 (d,e) as select abs(b), abs(c) from t1;
3434
show create view v2;
35+
--sorted_result
3536
select d,e from v2;
3637
--replace_column 10 X
3738
explain select d,e from v2;
3839

3940
# VIEW on VIEW test
4041
create view v3 (d,e) as select d*2, e*2 from v1;
42+
--sorted_result
4143
select * from v3;
4244
--replace_column 10 X
4345
explain select * from v3;
@@ -56,6 +58,7 @@ create view v1 as select distinct b from t1;
5658
select * from v1;
5759
--replace_column 10 X
5860
explain select * from v1;
61+
--sorted_result
5962
select * from t1;
6063
drop view v1;
6164
create view v1 as select distinct c from t1;
@@ -74,11 +77,12 @@ create table t1 (a int not null,
7477
c int generated always as (-a) stored);
7578
insert into t1 (a) values (1), (2), (3), (4);
7679
create view v1 as select b+1 from t1 order by 1 desc limit 2;
77-
select * from v1;
80+
select * from v1 order by 1 desc;
7881
--replace_column 10 X
7982
explain select * from v1;
8083
drop view v1;
8184
create view v1 as select c+1 from t1 order by 1 desc limit 2;
85+
--sorted_result
8286
select * from v1;
8387
--replace_column 10 X
8488
explain select * from v1;
@@ -97,8 +101,8 @@ insert into t1 (a,b) values (10,2), (20,3), (30,4), (40,5), (50,10);
97101
create view v1 (a,e,f,g) as select a, b+1,c+1,d+1 from t1;
98102
# updatable field of updateable view
99103
update v1 set a=a+e;
100-
select * from v1;
101-
select * from t1;
104+
select * from v1 order by a;
105+
select * from t1 order by a;
102106
delete from v1;
103107
select * from v1;
104108
select * from t1;

0 commit comments

Comments
 (0)