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

Merge 10.9 into 10.10

Browse Source
This commit is contained in:
Marko Mäkelä
2023-07-26 14:17:36 +03:00
parent c2d5523545 864bbd4d09
commit b1b47264d2
148 changed files with 4410 additions and 2158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mysql-test/suite/sys_vars/r/log_slow_verbosity_basic.result
View File

@@ -67,10 +67,10 @@ set session log_slow_verbosity='explain';
select @@session.log_slow_verbosity;
@@session.log_slow_verbosity
explain
set session log_slow_verbosity='innodb,query_plan,explain';
set session log_slow_verbosity='innodb,query_plan,explain,engine,full';
select @@session.log_slow_verbosity;
@@session.log_slow_verbosity
innodb,query_plan,explain
innodb,query_plan,explain,engine,full
set session log_slow_verbosity='';
select @@session.log_slow_verbosity;
@@session.log_slow_verbosity
@@ -81,6 +81,6 @@ set session log_slow_verbosity=1e1;
ERROR 42000: Incorrect argument type to variable 'log_slow_verbosity'
set session log_slow_verbosity="foo";
ERROR 42000: Variable 'log_slow_verbosity' can't be set to the value of 'foo'
set session log_slow_verbosity=8;
ERROR 42000: Variable 'log_slow_verbosity' can't be set to the value of '8'
set session log_slow_verbosity=32;
ERROR 42000: Variable 'log_slow_verbosity' can't be set to the value of '32'
SET @@global.log_slow_verbosity = @start_global_value;

2
mysql-test/suite/sys_vars/r/sysvars_server_embedded.result
View File

@@ -1729,7 +1729,7 @@ VARIABLE_COMMENT Verbosity level for the slow log
NUMERIC_MIN_VALUE NULL
NUMERIC_MAX_VALUE NULL
NUMERIC_BLOCK_SIZE NULL
ENUM_VALUE_LIST innodb,query_plan,explain
ENUM_VALUE_LIST innodb,query_plan,explain,engine,full
READ_ONLY NO
COMMAND_LINE_ARGUMENT REQUIRED
VARIABLE_NAME LOG_WARNINGS

2
mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result
View File

@@ -1879,7 +1879,7 @@ VARIABLE_COMMENT Verbosity level for the slow log
NUMERIC_MIN_VALUE NULL
NUMERIC_MAX_VALUE NULL
NUMERIC_BLOCK_SIZE NULL
ENUM_VALUE_LIST innodb,query_plan,explain
ENUM_VALUE_LIST innodb,query_plan,explain,engine,full
READ_ONLY NO
COMMAND_LINE_ARGUMENT REQUIRED
VARIABLE_NAME LOG_WARNINGS