diff options
| author | Alexander Barkov <bar@mariadb.org> | 2015-09-02 11:51:07 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2015-09-02 11:51:07 +0400 |
| commit | 4f37a861c977e333f79c114cdae0e6c3b355bd45 (patch) | |
| tree | cf9f9fea420d23103930690fafb37f61b300036d /mysql-test/suite/vcol/inc | |
| parent | aa1002a35cefcc1851cbfb6b6b60463bda6f9aa3 (diff) | |
| download | mariadb-git-4f37a861c977e333f79c114cdae0e6c3b355bd45.tar.gz | |
The fix for MDEV-8723 unintentionally broke vcol_supported_sql_funcs_myisam
and vcol_supported_sql_funcs_innodb. Moving the test for using CHARSET(),
COLLATION(), COERCIBILITY() in virtual column from
vcol_supported_sql_funcs_xxx to vcol_blocked_sql_funcs_xxx,
as these functions are not supported in virtual columns any longer.
Discussed with Sanja on IRC.
Diffstat (limited to 'mysql-test/suite/vcol/inc')
| -rw-r--r-- | mysql-test/suite/vcol/inc/vcol_blocked_sql_funcs_main.inc | 12 | ||||
| -rw-r--r-- | mysql-test/suite/vcol/inc/vcol_supported_sql_funcs_main.inc | 18 |
2 files changed, 12 insertions, 18 deletions
diff --git a/mysql-test/suite/vcol/inc/vcol_blocked_sql_funcs_main.inc b/mysql-test/suite/vcol/inc/vcol_blocked_sql_funcs_main.inc index 8124e4df888..571fe75560b 100644 --- a/mysql-test/suite/vcol/inc/vcol_blocked_sql_funcs_main.inc +++ b/mysql-test/suite/vcol/inc/vcol_blocked_sql_funcs_main.inc @@ -102,6 +102,18 @@ if (!$skip_full_text_checks) -- error ER_VIRTUAL_COLUMN_FUNCTION_IS_NOT_ALLOWED create table t1 (a varchar(1024), b varchar(1024) as (benchmark(a,3))); +--echo # CHARSET() +-- error ER_CONST_EXPR_IN_VCOL +create table t1 (a varchar(64), b varchar(64) as (charset(a))); + +--echo # COERCIBILITY() +-- error ER_CONST_EXPR_IN_VCOL +create table t1 (a varchar(64), b int as (coercibility(a))); + +--echo # COLLATION() +-- error ER_CONST_EXPR_IN_VCOL +create table t1 (a varchar(64), b varchar(64) as (collation(a))); + --echo # CONNECTION_ID() -- error ER_VIRTUAL_COLUMN_FUNCTION_IS_NOT_ALLOWED create table t1 (a int as (connection_id())); diff --git a/mysql-test/suite/vcol/inc/vcol_supported_sql_funcs_main.inc b/mysql-test/suite/vcol/inc/vcol_supported_sql_funcs_main.inc index 5d2cbc63a6d..38f2b00a1a0 100644 --- a/mysql-test/suite/vcol/inc/vcol_supported_sql_funcs_main.inc +++ b/mysql-test/suite/vcol/inc/vcol_supported_sql_funcs_main.inc @@ -1142,24 +1142,6 @@ let $values1 = 5,default; let $rows = 1; --source suite/vcol/inc/vcol_supported_sql_funcs.inc ---echo # CHARSET() -let $cols = a varchar(1024), b varchar(1024) as (charset(a)); -let $values1 = 'abc',default; -let $rows = 1; ---source suite/vcol/inc/vcol_supported_sql_funcs.inc - ---echo # COERCIBILITY() -let $cols = a varchar(1024), b int as (coercibility(a)); -let $values1 = 'abc',default; -let $rows = 1; ---source suite/vcol/inc/vcol_supported_sql_funcs.inc - ---echo # COLLATION() -let $cols = a varchar(1024), b varchar(1024) as (collation(a)); -let $values1 = 'abc',default; -let $rows = 1; ---source suite/vcol/inc/vcol_supported_sql_funcs.inc - --echo # COMPRESS(), UNCOMPRESS() let $cols = a varchar(1024), b varchar(1024) as (uncompress(compress(a))); let $values1 = 'MySQL',default; |