diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2022-04-21 10:04:04 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2022-04-21 10:05:50 +0200 |
| commit | 6f6c74b0d18d5d4fa8a112a6793653ef5242726d (patch) | |
| tree | 0410c1f500341283233dbb9cb39511aab9baf123 /mysql-test/suite/vcol/t | |
| parent | 4730314a70119ae5857edffe2d1bec86960ef22b (diff) | |
| parent | 5ba77222e9fe7af8ff403816b5338b18b342053c (diff) | |
| download | mariadb-git-6f6c74b0d18d5d4fa8a112a6793653ef5242726d.tar.gz | |
Merge branch '10.2' into 10.3
Diffstat (limited to 'mysql-test/suite/vcol/t')
| -rw-r--r-- | mysql-test/suite/vcol/t/vcol_misc.opt | 1 | ||||
| -rw-r--r-- | mysql-test/suite/vcol/t/vcol_misc.test | 15 | ||||
| -rw-r--r-- | mysql-test/suite/vcol/t/wrong_arena.test | 23 |
3 files changed, 33 insertions, 6 deletions
diff --git a/mysql-test/suite/vcol/t/vcol_misc.opt b/mysql-test/suite/vcol/t/vcol_misc.opt new file mode 100644 index 00000000000..fd1faea4f8e --- /dev/null +++ b/mysql-test/suite/vcol/t/vcol_misc.opt @@ -0,0 +1 @@ +--character-sets-dir=$MYSQL_TEST_DIR/std_data/ldml/ diff --git a/mysql-test/suite/vcol/t/vcol_misc.test b/mysql-test/suite/vcol/t/vcol_misc.test index 07f96f4e0b8..e5609003806 100644 --- a/mysql-test/suite/vcol/t/vcol_misc.test +++ b/mysql-test/suite/vcol/t/vcol_misc.test @@ -489,5 +489,20 @@ DROP TABLE t1; SET sql_mode=DEFAULT; --echo # +--echo # CONTEXT_ANALYSIS_ONLY_VCOL_EXPR +--echo # + +--source include/have_ucs2.inc +create table t1 (c1 char(1) character set ucs2 collate ucs2_test_ci, + v1 char(1) character set ucs2 collate ucs2_test_ci as (c1), + v2 int as (c1 = 'b'), + v3 int as (v1 = 'b')); +insert into t1 (c1) values ('a'); +select * from t1 where v1 = 'b'; +show create table t1; +drop table t1; + +--echo # --echo # End of 10.2 tests --echo # + diff --git a/mysql-test/suite/vcol/t/wrong_arena.test b/mysql-test/suite/vcol/t/wrong_arena.test index 8ac1af5c36b..296cb68f5c0 100644 --- a/mysql-test/suite/vcol/t/wrong_arena.test +++ b/mysql-test/suite/vcol/t/wrong_arena.test @@ -3,9 +3,9 @@ # not in the TABLE::expr_arena. # -# -# MDEV-9690 concurrent queries with virtual columns crash in temporal code -# +--echo # +--echo # MDEV-9690 concurrent queries with virtual columns crash in temporal code +--echo # create table t1 (a datetime, # get_datetime_value b int as (a > 1), # Arg_comparator @@ -40,9 +40,9 @@ connection default; select * from t1; drop table t1; -# -# MDEV-13435 Crash when selecting virtual columns generated using JSON functions -# +--echo # +--echo # MDEV-13435 Crash when selecting virtual columns generated using JSON functions +--echo # create table t1 ( id int not null , js varchar(1000) not null, @@ -50,3 +50,14 @@ create table t1 ( insert into t1(id,js) values (0, '{"default" : {"start": "00:00:00", "end":"23:59:50"}}'); select * from t1; drop table t1; + +--echo # +--echo # MDEV-26281 ASAN use-after-poison when complex conversion is involved in blob +--echo # +create table t1 (v2 blob as ('a' is null), a1 int, a char(1) as (cast(a1 in (0,current_user() is null) as char(16777216) ))); +insert ignore into t1 values ('x','x',v2) ; +drop table t1; + +--echo # +--echo # End of 10.2 tests +--echo # |