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.11-vp-MDEV-27691' into 10.11

Browse Source
This commit is contained in:
Oleksandr Byelkin
2022-10-17 19:12:21 +02:00
parent 950e4f584d 336dbe55f3
commit 35b831d971
328 changed files with 2269 additions and 200 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;
@ -1044,6 +1045,7 @@ select sql_text from mysql.slow_log where sql_text not like 'set @@long_query_ti
set statement long_query_time=0.01,log_slow_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