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

Merge branch '10.10' into 10.11

Browse Source
This commit is contained in:
Oleksandr Byelkin
2023-08-08 14:57:31 +02:00
parent 1ba5a0205c d2fdba94cf
commit 036df5f970
871 changed files with 12640 additions and 6371 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_ps2_protocol
--disable_view_protocol
set @save_general_log=@@global.general_log;
--echo # SET STATEMENT works (OK)
@ -1046,6 +1047,7 @@ set statement long_query_time=0.01,log_slow_min_examined_row_limit=50 for select
select sql_text from mysql.slow_log where sql_text not like 'set @@long_query_time%';
--echo #---
--enable_view_protocol
--enable_ps2_protocol
#
# log_slow_verbosity is impossible to check because results are not written
# in TABLE mode