1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00

Merge branch '10.2' into 10.3

This commit is contained in:
Monty
2019-09-02 14:06:56 +03:00
671 changed files with 11116 additions and 14190 deletions

View File

@@ -15,6 +15,10 @@ create table t2 (a int) engine=myisam;
# transactions are committed and after when they are aborted.
#
set @save_binlog_stmt_cache_size=@@global.binlog_stmt_cache_size;
set @save_binlog_cache_size=@@global.binlog_cache_size;
set @@global.binlog_stmt_cache_size=32768;
set @@global.binlog_cache_size=32768;
#
# Checking commit.
#
@@ -249,3 +253,6 @@ if (`SELECT $got_cache <> $exp_cache || $got_disk <> $exp_disk || $got_stmt_cach
-- die
}
drop table t1, t2;
set @@global.binlog_stmt_cache_size=@save_binlog_stmt_cache_size;
set @@global.binlog_cache_size=@save_binlog_cache_size;