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 'bb-10.3-all-builders' into bb-10.4-all-builders

Browse Source
This commit is contained in:
Lena Startseva
2022-09-23 19:47:13 +07:00
parent 0c0a569028 72ba96a48e
commit 78dcf71e88
274 changed files with 1896 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/main/set_statement.test
View File

@ -976,6 +976,7 @@ SET STATEMENT keycache1.key_buffer_size=1024 FOR SELECT 1;
#
# MDEV-6940: SET STATEMENT executed after SET GLOBAL does not work
#
--disable_view_protocol
set @save_general_log=@@global.general_log;
--echo # SET STATEMENT works (OK)
set statement lock_wait_timeout=1 for select @@lock_wait_timeout;
@ -1036,6 +1037,7 @@ select sql_text from mysql.slow_log where sql_text not like 'set @@long_query_ti
set statement long_query_time=0.01,min_examined_row_limit=50 for select sleep(0.1);
select sql_text from mysql.slow_log where sql_text not like 'set @@long_query_time%';
--echo #---
--enable_view_protocol
#
# log_slow_verbosity is impossible to check because results are not written
# in TABLE mode