1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

followup for MDEV-6996, update tests and results

Browse Source
This commit is contained in:
Sergei Golubchik 2014-12-03 21:33:34 +01:00
parent 24a6b41348
commit 7bf4f9f7f6
9 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/suite/vcol/inc/vcol_blocked_sql_funcs_main.inc
View File

@ -87,6 +87,10 @@ create table t1 (a datetime, b datetime as (utc_time()));
-- error ER_VIRTUAL_COLUMN_FUNCTION_IS_NOT_ALLOWED -- error ER_VIRTUAL_COLUMN_FUNCTION_IS_NOT_ALLOWED
create table t1 (a datetime, b datetime as (utc_timestamp())); create table t1 (a datetime, b datetime as (utc_timestamp()));
--echo # WEEK() - one argument version
-- error ER_VIRTUAL_COLUMN_FUNCTION_IS_NOT_ALLOWED
create table t1 (a datetime, b datetime as (week(a)));
--echo # MATCH() --echo # MATCH()
if (!$skip_full_text_checks) if (!$skip_full_text_checks)
{ {

4
mysql-test/suite/vcol/inc/vcol_non_stored_columns.inc
View File

@ -141,7 +141,7 @@ show create table t1;
drop table t1; drop table t1;
--echo # Case 14. ALTER. Changing the expression of a virtual stored column. --echo # Case 14. ALTER. Changing the expression of a virtual stored column.
create table t1 (a int, b datetime, c int as (week(b)) persistent); create table t1 (a int, b datetime, c int as (week(b,0)) persistent);
insert into t1 values (1,'2008-09-04',default); insert into t1 values (1,'2008-09-04',default);
insert into t1 values (2,'2008-09-05',default); insert into t1 values (2,'2008-09-05',default);
select * from t1; select * from t1;
@ -151,7 +151,7 @@ show create table t1;
drop table t1; drop table t1;
--echo # Case 15. ALTER. Changing the expression of a virtual non-stored column. --echo # Case 15. ALTER. Changing the expression of a virtual non-stored column.
create table t1 (a int, b datetime, c int as (week(b))); create table t1 (a int, b datetime, c int as (week(b,0)));
insert into t1 values (1,'2008-09-04',default); insert into t1 values (1,'2008-09-04',default);
insert into t1 values (2,'2008-09-05',default); insert into t1 values (2,'2008-09-05',default);
select * from t1; select * from t1;

2
mysql-test/suite/vcol/inc/vcol_supported_sql_funcs_main.inc
View File

@ -1068,7 +1068,7 @@ let $rows = 1;
--source suite/vcol/inc/vcol_supported_sql_funcs.inc --source suite/vcol/inc/vcol_supported_sql_funcs.inc
--echo # WEEK() --echo # WEEK()
let $cols = a datetime, b int as (week(a)); let $cols = a datetime, b int as (week(a,0));
let $values1 = '2008-09-01',default; let $values1 = '2008-09-01',default;
let $rows = 1; let $rows = 1;
--source suite/vcol/inc/vcol_supported_sql_funcs.inc --source suite/vcol/inc/vcol_supported_sql_funcs.inc

3
mysql-test/suite/vcol/r/vcol_blocked_sql_funcs_innodb.result
View File

@ -54,6 +54,9 @@ ERROR HY000: Function or expression is not allowed for column 'b'
# UTC_TIMESTAMP() # UTC_TIMESTAMP()
create table t1 (a datetime, b datetime as (utc_timestamp())); create table t1 (a datetime, b datetime as (utc_timestamp()));
ERROR HY000: Function or expression is not allowed for column 'b' ERROR HY000: Function or expression is not allowed for column 'b'
# WEEK() - one argument version
create table t1 (a datetime, b datetime as (week(a)));
ERROR HY000: Function or expression is not allowed for column 'b'
# MATCH() # MATCH()
# BENCHMARK() # BENCHMARK()
create table t1 (a varchar(1024), b varchar(1024) as (benchmark(a,3))); create table t1 (a varchar(1024), b varchar(1024) as (benchmark(a,3)));

3
mysql-test/suite/vcol/r/vcol_blocked_sql_funcs_myisam.result
View File

@ -54,6 +54,9 @@ ERROR HY000: Function or expression is not allowed for column 'b'
# UTC_TIMESTAMP() # UTC_TIMESTAMP()
create table t1 (a datetime, b datetime as (utc_timestamp())); create table t1 (a datetime, b datetime as (utc_timestamp()));
ERROR HY000: Function or expression is not allowed for column 'b' ERROR HY000: Function or expression is not allowed for column 'b'
# WEEK() - one argument version
create table t1 (a datetime, b datetime as (week(a)));
ERROR HY000: Function or expression is not allowed for column 'b'
# MATCH() # MATCH()
create table t1 (a varchar(32), b bool as (match a against ('sample text'))); create table t1 (a varchar(32), b bool as (match a against ('sample text')));
ERROR HY000: Function or expression is not allowed for column 'b' ERROR HY000: Function or expression is not allowed for column 'b'

4
mysql-test/suite/vcol/r/vcol_non_stored_columns_innodb.result
View File

@ -199,7 +199,7 @@ t1 CREATE TABLE `t1` (
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
drop table t1; drop table t1;
# Case 14. ALTER. Changing the expression of a virtual stored column. # Case 14. ALTER. Changing the expression of a virtual stored column.
create table t1 (a int, b datetime, c int as (week(b)) persistent); create table t1 (a int, b datetime, c int as (week(b,0)) persistent);
insert into t1 values (1,'2008-09-04',default); insert into t1 values (1,'2008-09-04',default);
insert into t1 values (2,'2008-09-05',default); insert into t1 values (2,'2008-09-05',default);
select * from t1; select * from t1;
@ -220,7 +220,7 @@ t1 CREATE TABLE `t1` (
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
drop table t1; drop table t1;
# Case 15. ALTER. Changing the expression of a virtual non-stored column. # Case 15. ALTER. Changing the expression of a virtual non-stored column.
create table t1 (a int, b datetime, c int as (week(b))); create table t1 (a int, b datetime, c int as (week(b,0)));
insert into t1 values (1,'2008-09-04',default); insert into t1 values (1,'2008-09-04',default);
insert into t1 values (2,'2008-09-05',default); insert into t1 values (2,'2008-09-05',default);
select * from t1; select * from t1;

4
mysql-test/suite/vcol/r/vcol_non_stored_columns_myisam.result
View File

@ -199,7 +199,7 @@ t1 CREATE TABLE `t1` (
) ENGINE=MyISAM DEFAULT CHARSET=latin1 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
drop table t1; drop table t1;
# Case 14. ALTER. Changing the expression of a virtual stored column. # Case 14. ALTER. Changing the expression of a virtual stored column.
create table t1 (a int, b datetime, c int as (week(b)) persistent); create table t1 (a int, b datetime, c int as (week(b,0)) persistent);
insert into t1 values (1,'2008-09-04',default); insert into t1 values (1,'2008-09-04',default);
insert into t1 values (2,'2008-09-05',default); insert into t1 values (2,'2008-09-05',default);
select * from t1; select * from t1;
@ -220,7 +220,7 @@ t1 CREATE TABLE `t1` (
) ENGINE=MyISAM DEFAULT CHARSET=latin1 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
drop table t1; drop table t1;
# Case 15. ALTER. Changing the expression of a virtual non-stored column. # Case 15. ALTER. Changing the expression of a virtual non-stored column.
create table t1 (a int, b datetime, c int as (week(b))); create table t1 (a int, b datetime, c int as (week(b,0)));
insert into t1 values (1,'2008-09-04',default); insert into t1 values (1,'2008-09-04',default);
insert into t1 values (2,'2008-09-05',default); insert into t1 values (2,'2008-09-05',default);
select * from t1; select * from t1;

4
mysql-test/suite/vcol/r/vcol_supported_sql_funcs_innodb.result
View File

@ -2595,12 +2595,12 @@ drop table t1;
set sql_warnings = 0; set sql_warnings = 0;
# WEEK() # WEEK()
set sql_warnings = 1; set sql_warnings = 1;
create table t1 (a datetime, b int as (week(a))); create table t1 (a datetime, b int as (week(a,0)));
show create table t1; show create table t1;
Table Create Table Table Create Table
t1 CREATE TABLE `t1` ( t1 CREATE TABLE `t1` (
`a` datetime DEFAULT NULL, `a` datetime DEFAULT NULL,
`b` int(11) AS (week(a)) VIRTUAL `b` int(11) AS (week(a,0)) VIRTUAL
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
insert into t1 values ('2008-09-01',default); insert into t1 values ('2008-09-01',default);
select * from t1; select * from t1;

4
mysql-test/suite/vcol/r/vcol_supported_sql_funcs_myisam.result
View File

@ -2595,12 +2595,12 @@ drop table t1;
set sql_warnings = 0; set sql_warnings = 0;
# WEEK() # WEEK()
set sql_warnings = 1; set sql_warnings = 1;
create table t1 (a datetime, b int as (week(a))); create table t1 (a datetime, b int as (week(a,0)));
show create table t1; show create table t1;
Table Create Table Table Create Table
t1 CREATE TABLE `t1` ( t1 CREATE TABLE `t1` (
`a` datetime DEFAULT NULL, `a` datetime DEFAULT NULL,
`b` int(11) AS (week(a)) VIRTUAL `b` int(11) AS (week(a,0)) VIRTUAL
) ENGINE=MyISAM DEFAULT CHARSET=latin1 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
insert into t1 values ('2008-09-01',default); insert into t1 values ('2008-09-01',default);
select * from t1; select * from t1;