1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00

Merge branch '10.6' into 10.11

This commit is contained in:
Oleksandr Byelkin
2024-10-29 15:24:38 +01:00
655 changed files with 8060 additions and 3541 deletions

View File

@ -2790,9 +2790,19 @@ INSERT INTO t1 (a,b) VALUES (10, 20);
SELECT * FROM t1;
DROP TABLE t1;
--echo #
--echo # End of 10.3 tests
--echo #
--echo # MDEV-32022 ERROR 1054 (42S22): Unknown column 'X' in 'NEW' in trigger
--echo #
create table t1 (m set('sms') not null);
create table t2 (i int);
create table t3 (j int);
create trigger t1 after insert on t1 for each row insert ignore into t2 select t3.j from t3 join (select 'sms' as method) m on find_in_set(m.method, new.m);
insert into t1 values ('sms');
drop table t1, t2, t3;
--echo # End of 10.5 tests
--echo #
--echo # Test dropping orphan .trn file
@ -2835,6 +2845,4 @@ drop trigger t1_trg_2;
drop table t1;
--remove_file $MYSQLD_DATADIR/test/t1_trg.TMP
--echo #
--echo # End of 10.6 tests
--echo #