diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-07-01 18:15:00 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-07-01 18:15:00 +0000 |
| commit | a2a2e32c02643a0cec111511220227703fda1cd5 (patch) | |
| tree | 69cc2b631234c2a8e026b9cd4d72676c61c594df /mysql-test/suite/vcol/r | |
| parent | Releasing progress-linux version 1:10.11.8-1~progress7.99u1. (diff) | |
| download | mariadb-a2a2e32c02643a0cec111511220227703fda1cd5.tar.xz mariadb-a2a2e32c02643a0cec111511220227703fda1cd5.zip | |
Merging upstream version 1:11.4.2.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'mysql-test/suite/vcol/r')
6 files changed, 16 insertions, 5 deletions
diff --git a/mysql-test/suite/vcol/r/vcol_blocked_sql_funcs.result b/mysql-test/suite/vcol/r/vcol_blocked_sql_funcs.result index 425aa1b1..71f1348d 100644 --- a/mysql-test/suite/vcol/r/vcol_blocked_sql_funcs.result +++ b/mysql-test/suite/vcol/r/vcol_blocked_sql_funcs.result @@ -1,4 +1,13 @@ SET @@session.default_storage_engine = 'MyISAM'; +# AES_ENCRYPT() without the mode (4th argument) +create or replace table t1 (b blob as (aes_encrypt('abc', 'bcd')) PERSISTENT); +ERROR HY000: Function or expression 'aes_encrypt()' cannot be used in the GENERATED ALWAYS AS clause of `b` +create or replace table t1 (b blob as (aes_encrypt('abc', 'bcd','def')) PERSISTENT); +ERROR HY000: Function or expression 'aes_encrypt()' cannot be used in the GENERATED ALWAYS AS clause of `b` +create or replace table t1 (b blob as (aes_decrypt('abc', 'bcd')) PERSISTENT); +ERROR HY000: Function or expression 'aes_decrypt()' cannot be used in the GENERATED ALWAYS AS clause of `b` +create or replace table t1 (b blob as (aes_decrypt('abc', 'bcd','def')) PERSISTENT); +ERROR HY000: Function or expression 'aes_decrypt()' cannot be used in the GENERATED ALWAYS AS clause of `b` # RAND() create or replace table t1 (b double as (rand())); create or replace table t1 (b double as (rand()) PERSISTENT); diff --git a/mysql-test/suite/vcol/r/vcol_ins_upd_innodb.result b/mysql-test/suite/vcol/r/vcol_ins_upd_innodb.result index 6807f89f..624477d2 100644 --- a/mysql-test/suite/vcol/r/vcol_ins_upd_innodb.result +++ b/mysql-test/suite/vcol/r/vcol_ins_upd_innodb.result @@ -3,6 +3,7 @@ create table t1 (a int, b int as (-a), c int as (-a) persistent); set sql_warnings = 1; +set @@optimizer_scan_setup_cost=0; # # *** INSERT *** # diff --git a/mysql-test/suite/vcol/r/vcol_ins_upd_myisam.result b/mysql-test/suite/vcol/r/vcol_ins_upd_myisam.result index 43206dba..823b4f52 100644 --- a/mysql-test/suite/vcol/r/vcol_ins_upd_myisam.result +++ b/mysql-test/suite/vcol/r/vcol_ins_upd_myisam.result @@ -3,6 +3,7 @@ create table t1 (a int, b int as (-a), c int as (-a) persistent); set sql_warnings = 1; +set @@optimizer_scan_setup_cost=0; # # *** INSERT *** # diff --git a/mysql-test/suite/vcol/r/vcol_misc.result b/mysql-test/suite/vcol/r/vcol_misc.result index 3bb06116..710bd105 100644 --- a/mysql-test/suite/vcol/r/vcol_misc.result +++ b/mysql-test/suite/vcol/r/vcol_misc.result @@ -181,8 +181,8 @@ a b c 2 3 y 0 1 y,n drop table t1,t2; -SET @old_debug= @@global.debug; -SET @old_debug= @@global.debug; +SET @old_debug= @@global.debug_dbug; +SET @old_debug= @@global.debug_dbug; SET GLOBAL debug_dbug= "+d,write_delay_wakeup"; CREATE TABLE t1 (a int, ts TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, diff --git a/mysql-test/suite/vcol/r/vcol_select_innodb.result b/mysql-test/suite/vcol/r/vcol_select_innodb.result index 40308b6e..57a17cbe 100644 --- a/mysql-test/suite/vcol/r/vcol_select_innodb.result +++ b/mysql-test/suite/vcol/r/vcol_select_innodb.result @@ -135,7 +135,7 @@ count(distinct c) 3 explain select count(distinct c) from t1; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t1 range NULL c 5 NULL 6 Using index for group-by +1 SIMPLE t1 range NULL c 5 NULL 5 Using index for group-by ### ### filesort & range-based utils ### diff --git a/mysql-test/suite/vcol/r/vcol_select_myisam.result b/mysql-test/suite/vcol/r/vcol_select_myisam.result index 05f86347..8964eda1 100644 --- a/mysql-test/suite/vcol/r/vcol_select_myisam.result +++ b/mysql-test/suite/vcol/r/vcol_select_myisam.result @@ -74,7 +74,7 @@ a b c explain select * from t1 where c in (select c from t3 where c between -2 and -1); id select_type table type possible_keys key key_len ref rows Extra 1 PRIMARY t3 range c c 5 NULL 2 Using where; Using index -1 PRIMARY t1 ref c c 5 test.t3.c 2 +1 PRIMARY t1 ref c c 5 test.t3.c 1 # select_type=UNION, type=system # select_type=UNION RESULT, type=<union1,2> select * from t1 union select * from t2; @@ -133,7 +133,7 @@ count(distinct c) 3 explain select count(distinct c) from t1; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t1 range NULL c 5 NULL 6 Using index for group-by +1 SIMPLE t1 range NULL c 5 NULL 5 Using index for group-by ### ### filesort & range-based utils ### |