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

Merge branch '10.4' into mariadb-10.4.32

Browse Source
This commit is contained in:
Oleksandr Byelkin
2023-11-14 08:14:44 +01:00
parent c4143f9095 be55051b6b
commit 0f4df26bec
269 changed files with 22794 additions and 1083 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/main/subselect.test
View File

@ -1172,8 +1172,10 @@ create table t1 (a int, b decimal(13, 3));
insert into t1 values (1, 0.123);
let $outfile_abs= $MYSQLTEST_VARDIR/tmp/subselect.out.file.1;
let $outfile_rel= ../../tmp/subselect.out.file.1;
--disable_warnings
--error 0,1
--remove_file $outfile_abs
--enable_warnings
eval select a, (select max(b) from t1) into outfile "$outfile_rel" from t1;
delete from t1;
eval load data infile "$outfile_rel" into table t1;
@ -5992,6 +5994,8 @@ drop table t1;
--echo #
--echo # MDEV-7565: Server crash with Signal 6 (part 2)
--echo #
truncate table mysql.slow_log;
Select
(Select Sum(`TestCase`.Revenue) From mysql.slow_log E
Where TestCase.TemplateID not in (Select 1 from mysql.slow_log where 2=2)