diff options
Diffstat (limited to 'mysql-test/suite/sys_vars/r')
148 files changed, 2015 insertions, 3490 deletions
diff --git a/mysql-test/suite/sys_vars/r/aria_sort_buffer_size_basic,32bit.rdiff b/mysql-test/suite/sys_vars/r/aria_sort_buffer_size_basic,32bit.rdiff deleted file mode 100644 index c30b99f1..00000000 --- a/mysql-test/suite/sys_vars/r/aria_sort_buffer_size_basic,32bit.rdiff +++ /dev/null @@ -1,9 +0,0 @@ ---- suite/sys_vars/r/aria_sort_buffer_size_basic.result 2021-02-02 02:58:55.686921205 +0200 -+++ suite/sys_vars/r/aria_sort_buffer_size_basic.reject 2021-02-02 11:02:12.361178360 +0200 -@@ -44,5 +44,5 @@ - set session aria_sort_buffer_size=cast(-1 as unsigned int); - select @@session.aria_sort_buffer_size; - @@session.aria_sort_buffer_size --9223372036854775807 -+2147483647 - SET @@global.aria_sort_buffer_size = @start_global_value; diff --git a/mysql-test/suite/sys_vars/r/binlog_annotate_row_events_grant.result b/mysql-test/suite/sys_vars/r/binlog_annotate_row_events_grant.result index 1ff25d20..69aa3644 100644 --- a/mysql-test/suite/sys_vars/r/binlog_annotate_row_events_grant.result +++ b/mysql-test/suite/sys_vars/r/binlog_annotate_row_events_grant.result @@ -2,18 +2,18 @@ # MDEV-21971 Bind BINLOG ADMIN to binlog_annotate_row_events and binlog_row_image global and session variables # SET @global=@@global.binlog_annotate_row_events; -# Test that "SET binlog_annotate_row_events" is not allowed without BINLOG ADMIN or SUPER +# Test that "SET binlog_annotate_row_events" is not allowed without BINLOG ADMIN CREATE USER user1@localhost; GRANT ALL PRIVILEGES ON *.* TO user1@localhost; -REVOKE BINLOG ADMIN, SUPER ON *.* FROM user1@localhost; +REVOKE BINLOG ADMIN ON *.* FROM user1@localhost; connect user1,localhost,user1,,; connection user1; SET GLOBAL binlog_annotate_row_events=1; -ERROR 42000: Access denied; you need (at least one of) the SUPER, BINLOG ADMIN privilege(s) for this operation +ERROR 42000: Access denied; you need (at least one of) the BINLOG ADMIN privilege(s) for this operation SET binlog_annotate_row_events=1; -ERROR 42000: Access denied; you need (at least one of) the SUPER, BINLOG ADMIN privilege(s) for this operation +ERROR 42000: Access denied; you need (at least one of) the BINLOG ADMIN privilege(s) for this operation SET SESSION binlog_annotate_row_events=1; -ERROR 42000: Access denied; you need (at least one of) the SUPER, BINLOG ADMIN privilege(s) for this operation +ERROR 42000: Access denied; you need (at least one of) the BINLOG ADMIN privilege(s) for this operation disconnect user1; connection default; DROP USER user1@localhost; @@ -28,15 +28,4 @@ SET SESSION binlog_annotate_row_events=1; disconnect user1; connection default; DROP USER user1@localhost; -# Test that "SET binlog_annotate_row_events" is allowed with SUPER -CREATE USER user1@localhost; -GRANT SUPER ON *.* TO user1@localhost; -connect user1,localhost,user1,,; -connection user1; -SET GLOBAL binlog_annotate_row_events=1; -SET binlog_annotate_row_events=1; -SET SESSION binlog_annotate_row_events=1; -disconnect user1; -connection default; -DROP USER user1@localhost; SET @@global.binlog_annotate_row_events=@global; diff --git a/mysql-test/suite/sys_vars/r/binlog_cache_size_grant.result b/mysql-test/suite/sys_vars/r/binlog_cache_size_grant.result index e6898e58..49dac964 100644 --- a/mysql-test/suite/sys_vars/r/binlog_cache_size_grant.result +++ b/mysql-test/suite/sys_vars/r/binlog_cache_size_grant.result @@ -2,14 +2,14 @@ # MDEV-21963 Bind BINLOG ADMIN to a number of global system variables # SET @global=@@global.binlog_cache_size; -# Test that "SET binlog_cache_size" is not allowed without BINLOG ADMIN or SUPER +# Test that "SET binlog_cache_size" is not allowed without BINLOG ADMIN CREATE USER user1@localhost; GRANT ALL PRIVILEGES ON *.* TO user1@localhost; -REVOKE BINLOG ADMIN, SUPER ON *.* FROM user1@localhost; +REVOKE BINLOG ADMIN ON *.* FROM user1@localhost; connect user1,localhost,user1,,; connection user1; SET GLOBAL binlog_cache_size=65536; -ERROR 42000: Access denied; you need (at least one of) the SUPER, BINLOG ADMIN privilege(s) for this operation +ERROR 42000: Access denied; you need (at least one of) the BINLOG ADMIN privilege(s) for this operation SET binlog_cache_size=65536; ERROR HY000: Variable 'binlog_cache_size' is a GLOBAL variable and should be set with SET GLOBAL SET SESSION binlog_cache_size=65536; @@ -30,17 +30,4 @@ ERROR HY000: Variable 'binlog_cache_size' is a GLOBAL variable and should be set disconnect user1; connection default; DROP USER user1@localhost; -# Test that "SET binlog_cache_size" is allowed with SUPER -CREATE USER user1@localhost; -GRANT SUPER ON *.* TO user1@localhost; -connect user1,localhost,user1,,; -connection user1; -SET GLOBAL binlog_cache_size=65536; -SET binlog_cache_size=65536; -ERROR HY000: Variable 'binlog_cache_size' is a GLOBAL variable and should be set with SET GLOBAL -SET SESSION binlog_cache_size=65536; -ERROR HY000: Variable 'binlog_cache_size' is a GLOBAL variable and should be set with SET GLOBAL -disconnect user1; -connection default; -DROP USER user1@localhost; SET @@global.binlog_cache_size=@global; diff --git a/mysql-test/suite/sys_vars/r/binlog_commit_wait_count_grant.result b/mysql-test/suite/sys_vars/r/binlog_commit_wait_count_grant.result index 930772f7..69d69cf5 100644 --- a/mysql-test/suite/sys_vars/r/binlog_commit_wait_count_grant.result +++ b/mysql-test/suite/sys_vars/r/binlog_commit_wait_count_grant.result @@ -2,14 +2,14 @@ # MDEV-21963 Bind BINLOG ADMIN to a number of global system variables # SET @global=@@global.binlog_commit_wait_count; -# Test that "SET binlog_commit_wait_count" is not allowed without BINLOG ADMIN or SUPER +# Test that "SET binlog_commit_wait_count" is not allowed without BINLOG ADMIN CREATE USER user1@localhost; GRANT ALL PRIVILEGES ON *.* TO user1@localhost; -REVOKE BINLOG ADMIN, SUPER ON *.* FROM user1@localhost; +REVOKE BINLOG ADMIN ON *.* FROM user1@localhost; connect user1,localhost,user1,,; connection user1; SET GLOBAL binlog_commit_wait_count=65536; -ERROR 42000: Access denied; you need (at least one of) the SUPER, BINLOG ADMIN privilege(s) for this operation +ERROR 42000: Access denied; you need (at least one of) the BINLOG ADMIN privilege(s) for this operation SET binlog_commit_wait_count=65536; ERROR HY000: Variable 'binlog_commit_wait_count' is a GLOBAL variable and should be set with SET GLOBAL SET SESSION binlog_commit_wait_count=65536; @@ -30,17 +30,4 @@ ERROR HY000: Variable 'binlog_commit_wait_count' is a GLOBAL variable and should disconnect user1; connection default; DROP USER user1@localhost; -# Test that "SET binlog_commit_wait_count" is allowed with SUPER -CREATE USER user1@localhost; -GRANT SUPER ON *.* TO user1@localhost; -connect user1,localhost,user1,,; -connection user1; -SET GLOBAL binlog_commit_wait_count=65536; -SET binlog_commit_wait_count=65536; -ERROR HY000: Variable 'binlog_commit_wait_count' is a GLOBAL variable and should be set with SET GLOBAL -SET SESSION binlog_commit_wait_count=65536; -ERROR HY000: Variable 'binlog_commit_wait_count' is a GLOBAL variable and should be set with SET GLOBAL -disconnect user1; -connection default; -DROP USER user1@localhost; SET @@global.binlog_commit_wait_count=@global; diff --git a/mysql-test/suite/sys_vars/r/binlog_commit_wait_usec_grant.result b/mysql-test/suite/sys_vars/r/binlog_commit_wait_usec_grant.result index cfbb759e..e5ef4fec 100644 --- a/mysql-test/suite/sys_vars/r/binlog_commit_wait_usec_grant.result +++ b/mysql-test/suite/sys_vars/r/binlog_commit_wait_usec_grant.result @@ -2,14 +2,14 @@ # MDEV-21963 Bind BINLOG ADMIN to a number of global system variables # SET @global=@@global.binlog_commit_wait_usec; -# Test that "SET binlog_commit_wait_usec" is not allowed without BINLOG ADMIN or SUPER +# Test that "SET binlog_commit_wait_usec" is not allowed without BINLOG ADMIN CREATE USER user1@localhost; GRANT ALL PRIVILEGES ON *.* TO user1@localhost; -REVOKE BINLOG ADMIN, SUPER ON *.* FROM user1@localhost; +REVOKE BINLOG ADMIN ON *.* FROM user1@localhost; connect user1,localhost,user1,,; connection user1; SET GLOBAL binlog_commit_wait_usec=65536; -ERROR 42000: Access denied; you need (at least one of) the SUPER, BINLOG ADMIN privilege(s) for this operation +ERROR 42000: Access denied; you need (at least one of) the BINLOG ADMIN privilege(s) for this operation SET binlog_commit_wait_usec=65536; ERROR HY000: Variable 'binlog_commit_wait_usec' is a GLOBAL variable and should be set with SET GLOBAL SET SESSION binlog_commit_wait_usec=65536; @@ -30,17 +30,4 @@ ERROR HY000: Variable 'binlog_commit_wait_usec' is a GLOBAL variable and should disconnect user1; connection default; DROP USER user1@localhost; -# Test that "SET binlog_commit_wait_usec" is allowed with SUPER -CREATE USER user1@localhost; -GRANT SUPER ON *.* TO user1@localhost; -connect user1,localhost,user1,,; -connection user1; -SET GLOBAL binlog_commit_wait_usec=65536; -SET binlog_commit_wait_usec=65536; -ERROR HY000: Variable 'binlog_commit_wait_usec' is a GLOBAL variable and should be set with SET GLOBAL -SET SESSION binlog_commit_wait_usec=65536; -ERROR HY000: Variable 'binlog_commit_wait_usec' is a GLOBAL variable and should be set with SET GLOBAL -disconnect user1; -connection default; -DROP USER user1@localhost; SET @@global.binlog_commit_wait_usec=@global; diff --git a/mysql-test/suite/sys_vars/r/binlog_direct_non_transactional_updates_grant.result b/mysql-test/suite/sys_vars/r/binlog_direct_non_transactional_updates_grant.result index e70dbbf4..f283d226 100644 --- a/mysql-test/suite/sys_vars/r/binlog_direct_non_transactional_updates_grant.result +++ b/mysql-test/suite/sys_vars/r/binlog_direct_non_transactional_updates_grant.result @@ -3,18 +3,18 @@ SET @session= @@global.binlog_direct_non_transactional_updates; # # # -# Test that "SET binlog_direct_non_transactional_updates" is not allowed without BINLOG ADMIN or SUPER +# Test that "SET binlog_direct_non_transactional_updates" is not allowed without BINLOG ADMIN CREATE USER user1@localhost; GRANT ALL PRIVILEGES ON *.* TO user1@localhost; -REVOKE BINLOG ADMIN, SUPER ON *.* FROM user1@localhost; +REVOKE BINLOG ADMIN ON *.* FROM user1@localhost; connect user1,localhost,user1,,; connection user1; SET binlog_direct_non_transactional_updates=0; -ERROR 42000: Access denied; you need (at least one of) the SUPER, BINLOG ADMIN privilege(s) for this operation +ERROR 42000: Access denied; you need (at least one of) the BINLOG ADMIN privilege(s) for this operation SET GLOBAL binlog_direct_non_transactional_updates=0; -ERROR 42000: Access denied; you need (at least one of) the SUPER, BINLOG ADMIN privilege(s) for this operation +ERROR 42000: Access denied; you need (at least one of) the BINLOG ADMIN privilege(s) for this operation SET SESSION binlog_direct_non_transactional_updates=0; -ERROR 42000: Access denied; you need (at least one of) the SUPER, BINLOG ADMIN privilege(s) for this operation +ERROR 42000: Access denied; you need (at least one of) the BINLOG ADMIN privilege(s) for this operation disconnect user1; connection default; DROP USER user1@localhost; @@ -29,16 +29,5 @@ SET SESSION binlog_direct_non_transactional_updates=0; disconnect user1; connection default; DROP USER user1@localhost; -# Test that "SET binlog_direct_non_transactional_updates" is allowed with SUPER -CREATE USER user1@localhost; -GRANT SUPER ON *.* TO user1@localhost; -connect user1,localhost,user1,,; -connection user1; -SET binlog_direct_non_transactional_updates=0; -SET GLOBAL binlog_direct_non_transactional_updates=0; -SET SESSION binlog_direct_non_transactional_updates=0; -disconnect user1; -connection default; -DROP USER user1@localhost; SET GLOBAL binlog_direct_non_transactional_updates=@global; SET SESSION binlog_direct_non_transactional_updates=@session; diff --git a/mysql-test/suite/sys_vars/r/binlog_expire_logs_seconds_grant.result b/mysql-test/suite/sys_vars/r/binlog_expire_logs_seconds_grant.result index 94b57d2e..5e864322 100644 --- a/mysql-test/suite/sys_vars/r/binlog_expire_logs_seconds_grant.result +++ b/mysql-test/suite/sys_vars/r/binlog_expire_logs_seconds_grant.result @@ -3,14 +3,14 @@ # Test that "SET binlog_expire_logs_seconds" is not allowed without BINLOG ADMIN or SUPER # SET @global=@@global.binlog_expire_logs_seconds; -# Test that "SET binlog_expire_logs_seconds" is not allowed without BINLOG ADMIN or SUPER +# Test that "SET binlog_expire_logs_seconds" is not allowed without BINLOG ADMIN CREATE USER user1@localhost; GRANT ALL PRIVILEGES ON *.* TO user1@localhost; -REVOKE BINLOG ADMIN, SUPER ON *.* FROM user1@localhost; +REVOKE BINLOG ADMIN ON *.* FROM user1@localhost; connect user1,localhost,user1,,; connection user1; SET GLOBAL binlog_expire_logs_seconds=10; -ERROR 42000: Access denied; you need (at least one of) the SUPER, BINLOG ADMIN privilege(s) for this operation +ERROR 42000: Access denied; you need (at least one of) the BINLOG ADMIN privilege(s) for this operation SET binlog_expire_logs_seconds=10; ERROR HY000: Variable 'binlog_expire_logs_seconds' is a GLOBAL variable and should be set with SET GLOBAL SET SESSION binlog_expire_logs_seconds=10; @@ -31,17 +31,4 @@ ERROR HY000: Variable 'binlog_expire_logs_seconds' is a GLOBAL variable and shou disconnect user1; connection default; DROP USER user1@localhost; -# Test that "SET binlog_expire_logs_seconds" is allowed with SUPER -CREATE USER user1@localhost; -GRANT SUPER ON *.* TO user1@localhost; -connect user1,localhost,user1,,; -connection user1; -SET GLOBAL binlog_expire_logs_seconds=10; -SET binlog_expire_logs_seconds=10; -ERROR HY000: Variable 'binlog_expire_logs_seconds' is a GLOBAL variable and should be set with SET GLOBAL -SET SESSION binlog_expire_logs_seconds=10; -ERROR HY000: Variable 'binlog_expire_logs_seconds' is a GLOBAL variable and should be set with SET GLOBAL -disconnect user1; -connection default; -DROP USER user1@localhost; SET @@global.binlog_expire_logs_seconds=@global; diff --git a/mysql-test/suite/sys_vars/r/binlog_file_cache_size_grant.result b/mysql-test/suite/sys_vars/r/binlog_file_cache_size_grant.result index 3cd5aaf5..38ae2098 100644 --- a/mysql-test/suite/sys_vars/r/binlog_file_cache_size_grant.result +++ b/mysql-test/suite/sys_vars/r/binlog_file_cache_size_grant.result @@ -2,14 +2,14 @@ # MDEV-21963 Bind BINLOG ADMIN to a number of global system variables # SET @global=@@global.binlog_file_cache_size; -# Test that "SET binlog_file_cache_size" is not allowed without BINLOG ADMIN or SUPER +# Test that "SET binlog_file_cache_size" is not allowed without BINLOG ADMIN CREATE USER user1@localhost; GRANT ALL PRIVILEGES ON *.* TO user1@localhost; -REVOKE BINLOG ADMIN, SUPER ON *.* FROM user1@localhost; +REVOKE BINLOG ADMIN ON *.* FROM user1@localhost; connect user1,localhost,user1,,; connection user1; SET GLOBAL binlog_file_cache_size=65536; -ERROR 42000: Access denied; you need (at least one of) the SUPER, BINLOG ADMIN privilege(s) for this operation +ERROR 42000: Access denied; you need (at least one of) the BINLOG ADMIN privilege(s) for this operation SET binlog_file_cache_size=65536; ERROR HY000: Variable 'binlog_file_cache_size' is a GLOBAL variable and should be set with SET GLOBAL SET SESSION binlog_file_cache_size=65536; @@ -30,17 +30,4 @@ ERROR HY000: Variable 'binlog_file_cache_size' is a GLOBAL variable and should b disconnect user1; connection default; DROP USER user1@localhost; -# Test that "SET binlog_file_cache_size" is allowed with SUPER -CREATE USER user1@localhost; -GRANT SUPER ON *.* TO user1@localhost; -connect user1,localhost,user1,,; -connection user1; -SET GLOBAL binlog_file_cache_size=65536; -SET binlog_file_cache_size=65536; -ERROR HY000: Variable 'binlog_file_cache_size' is a GLOBAL variable and should be set with SET GLOBAL -SET SESSION binlog_file_cache_size=65536; -ERROR HY000: Variable 'binlog_file_cache_size' is a GLOBAL variable and should be set with SET GLOBAL -disconnect user1; -connection default; -DROP USER user1@localhost; SET @@global.binlog_file_cache_size=@global; diff --git a/mysql-test/suite/sys_vars/r/binlog_format_grant.result b/mysql-test/suite/sys_vars/r/binlog_format_grant.result index b3cd77a6..ba9ec79d 100644 --- a/mysql-test/suite/sys_vars/r/binlog_format_grant.result +++ b/mysql-test/suite/sys_vars/r/binlog_format_grant.result @@ -1,18 +1,18 @@ # # # -# Test that "SET binlog_format" is not allowed without BINLOG ADMIN or SUPER +# Test that "SET binlog_format" is not allowed without BINLOG ADMIN CREATE USER user1@localhost; GRANT ALL PRIVILEGES ON *.* TO user1@localhost; -REVOKE BINLOG ADMIN, SUPER ON *.* FROM user1@localhost; +REVOKE BINLOG ADMIN ON *.* FROM user1@localhost; connect user1,localhost,user1,,; connection user1; SET binlog_format=mixed; -ERROR 42000: Access denied; you need (at least one of) the SUPER, BINLOG ADMIN privilege(s) for this operation +ERROR 42000: Access denied; you need (at least one of) the BINLOG ADMIN privilege(s) for this operation SET GLOBAL binlog_format=mixed; -ERROR 42000: Access denied; you need (at least one of) the SUPER, BINLOG ADMIN privilege(s) for this operation +ERROR 42000: Access denied; you need (at least one of) the BINLOG ADMIN privilege(s) for this operation SET SESSION binlog_format=mixed; -ERROR 42000: Access denied; you need (at least one of) the SUPER, BINLOG ADMIN privilege(s) for this operation +ERROR 42000: Access denied; you need (at least one of) the BINLOG ADMIN privilege(s) for this operation disconnect user1; connection default; DROP USER user1@localhost; @@ -27,14 +27,3 @@ SET SESSION binlog_format=mixed; disconnect user1; connection default; DROP USER user1@localhost; -# Test that "SET binlog_format" is allowed with SUPER -CREATE USER user1@localhost; -GRANT SUPER ON *.* TO user1@localhost; -connect user1,localhost,user1,,; -connection user1; -SET binlog_format=mixed; -SET GLOBAL binlog_format=mixed; -SET SESSION binlog_format=mixed; -disconnect user1; -connection default; -DROP USER user1@localhost; diff --git a/mysql-test/suite/sys_vars/r/binlog_row_image_grant.result b/mysql-test/suite/sys_vars/r/binlog_row_image_grant.result index d9cf65d9..c2194aec 100644 --- a/mysql-test/suite/sys_vars/r/binlog_row_image_grant.result +++ b/mysql-test/suite/sys_vars/r/binlog_row_image_grant.result @@ -2,18 +2,18 @@ # MDEV-21971 Bind BINLOG ADMIN to binlog_annotate_row_events and binlog_row_image global and session variables # SET @global=@@global.binlog_row_image; -# Test that "SET binlog_row_image" is not allowed without BINLOG ADMIN or SUPER +# Test that "SET binlog_row_image" is not allowed without BINLOG ADMIN CREATE USER user1@localhost; GRANT ALL PRIVILEGES ON *.* TO user1@localhost; -REVOKE BINLOG ADMIN, SUPER ON *.* FROM user1@localhost; +REVOKE BINLOG ADMIN ON *.* FROM user1@localhost; connect user1,localhost,user1,,; connection user1; SET GLOBAL binlog_row_image=1; -ERROR 42000: Access denied; you need (at least one of) the SUPER, BINLOG ADMIN privilege(s) for this operation +ERROR 42000: Access denied; you need (at least one of) the BINLOG ADMIN privilege(s) for this operation SET binlog_row_image=1; -ERROR 42000: Access denied; you need (at least one of) the SUPER, BINLOG ADMIN privilege(s) for this operation +ERROR 42000: Access denied; you need (at least one of) the BINLOG ADMIN privilege(s) for this operation SET SESSION binlog_row_image=1; -ERROR 42000: Access denied; you need (at least one of) the SUPER, BINLOG ADMIN privilege(s) for this operation +ERROR 42000: Access denied; you need (at least one of) the BINLOG ADMIN privilege(s) for this operation disconnect user1; connection default; DROP USER user1@localhost; @@ -28,15 +28,4 @@ SET SESSION binlog_row_image=1; disconnect user1; connection default; DROP USER user1@localhost; -# Test that "SET binlog_row_image" is allowed with SUPER -CREATE USER user1@localhost; -GRANT SUPER ON *.* TO user1@localhost; -connect user1,localhost,user1,,; -connection user1; -SET GLOBAL binlog_row_image=1; -SET binlog_row_image=1; -SET SESSION binlog_row_image=1; -disconnect user1; -connection default; -DROP USER user1@localhost; SET @@global.binlog_row_image=@global; diff --git a/mysql-test/suite/sys_vars/r/binlog_row_metadata_grant.result b/mysql-test/suite/sys_vars/r/binlog_row_metadata_grant.result index 43282278..2c47c148 100644 --- a/mysql-test/suite/sys_vars/r/binlog_row_metadata_grant.result +++ b/mysql-test/suite/sys_vars/r/binlog_row_metadata_grant.result @@ -2,14 +2,14 @@ # MDEV-21963 Bind BINLOG ADMIN to a number of global system variables # SET @global=@@global.binlog_row_metadata; -# Test that "SET binlog_row_metadata" is not allowed without BINLOG ADMIN or SUPER +# Test that "SET binlog_row_metadata" is not allowed without BINLOG ADMIN CREATE USER user1@localhost; GRANT ALL PRIVILEGES ON *.* TO user1@localhost; -REVOKE BINLOG ADMIN, SUPER ON *.* FROM user1@localhost; +REVOKE BINLOG ADMIN ON *.* FROM user1@localhost; connect user1,localhost,user1,,; connection user1; SET GLOBAL binlog_row_metadata=NO_LOG; -ERROR 42000: Access denied; you need (at least one of) the SUPER, BINLOG ADMIN privilege(s) for this operation +ERROR 42000: Access denied; you need (at least one of) the BINLOG ADMIN privilege(s) for this operation SET binlog_row_metadata=NO_LOG; ERROR HY000: Variable 'binlog_row_metadata' is a GLOBAL variable and should be set with SET GLOBAL SET SESSION binlog_row_metadata=NO_LOG; @@ -30,17 +30,4 @@ ERROR HY000: Variable 'binlog_row_metadata' is a GLOBAL variable and should be s disconnect user1; connection default; DROP USER user1@localhost; -# Test that "SET binlog_row_metadata" is allowed with SUPER -CREATE USER user1@localhost; -GRANT SUPER ON *.* TO user1@localhost; -connect user1,localhost,user1,,; -connection user1; -SET GLOBAL binlog_row_metadata=NO_LOG; -SET binlog_row_metadata=NO_LOG; -ERROR HY000: Variable 'binlog_row_metadata' is a GLOBAL variable and should be set with SET GLOBAL -SET SESSION binlog_row_metadata=NO_LOG; -ERROR HY000: Variable 'binlog_row_metadata' is a GLOBAL variable and should be set with SET GLOBAL -disconnect user1; -connection default; -DROP USER user1@localhost; SET @@global.binlog_row_metadata=@global; diff --git a/mysql-test/suite/sys_vars/r/binlog_stmt_cache_size_grant.result b/mysql-test/suite/sys_vars/r/binlog_stmt_cache_size_grant.result index 87070de9..ca2505e9 100644 --- a/mysql-test/suite/sys_vars/r/binlog_stmt_cache_size_grant.result +++ b/mysql-test/suite/sys_vars/r/binlog_stmt_cache_size_grant.result @@ -2,14 +2,14 @@ # MDEV-21963 Bind BINLOG ADMIN to a number of global system variables # SET @global=@@global.binlog_stmt_cache_size; -# Test that "SET binlog_stmt_cache_size" is not allowed without BINLOG ADMIN or SUPER +# Test that "SET binlog_stmt_cache_size" is not allowed without BINLOG ADMIN CREATE USER user1@localhost; GRANT ALL PRIVILEGES ON *.* TO user1@localhost; -REVOKE BINLOG ADMIN, SUPER ON *.* FROM user1@localhost; +REVOKE BINLOG ADMIN ON *.* FROM user1@localhost; connect user1,localhost,user1,,; connection user1; SET GLOBAL binlog_stmt_cache_size=65536; -ERROR 42000: Access denied; you need (at least one of) the SUPER, BINLOG ADMIN privilege(s) for this operation +ERROR 42000: Access denied; you need (at least one of) the BINLOG ADMIN privilege(s) for this operation SET binlog_stmt_cache_size=65536; ERROR HY000: Variable 'binlog_stmt_cache_size' is a GLOBAL variable and should be set with SET GLOBAL SET SESSION binlog_stmt_cache_size=65536; @@ -30,17 +30,4 @@ ERROR HY000: Variable 'binlog_stmt_cache_size' is a GLOBAL variable and should b disconnect user1; connection default; DROP USER user1@localhost; -# Test that "SET binlog_stmt_cache_size" is allowed with SUPER -CREATE USER user1@localhost; -GRANT SUPER ON *.* TO user1@localhost; -connect user1,localhost,user1,,; -connection user1; -SET GLOBAL binlog_stmt_cache_size=65536; -SET binlog_stmt_cache_size=65536; -ERROR HY000: Variable 'binlog_stmt_cache_size' is a GLOBAL variable and should be set with SET GLOBAL -SET SESSION binlog_stmt_cache_size=65536; -ERROR HY000: Variable 'binlog_stmt_cache_size' is a GLOBAL variable and should be set with SET GLOBAL -disconnect user1; -connection default; -DROP USER user1@localhost; SET @@global.binlog_stmt_cache_size=@global; diff --git a/mysql-test/suite/sys_vars/r/connect_timeout_grant.result b/mysql-test/suite/sys_vars/r/connect_timeout_grant.result index 96351490..488649a4 100644 --- a/mysql-test/suite/sys_vars/r/connect_timeout_grant.result +++ b/mysql-test/suite/sys_vars/r/connect_timeout_grant.result @@ -2,14 +2,14 @@ SET @global=@@global.connect_timeout; # # MDEV-21961 Bind CONNECTION ADMIN to a number of global system variables # -# Test that "SET connect_timeout" is not allowed without CONNECTION ADMIN or SUPER +# Test that "SET connect_timeout" is not allowed without CONNECTION ADMIN CREATE USER user1@localhost; GRANT ALL PRIVILEGES ON *.* TO user1@localhost; -REVOKE CONNECTION ADMIN, SUPER ON *.* FROM user1@localhost; +REVOKE CONNECTION ADMIN ON *.* FROM user1@localhost; connect user1,localhost,user1,,; connection user1; SET GLOBAL connect_timeout=10; -ERROR 42000: Access denied; you need (at least one of) the SUPER, CONNECTION ADMIN privilege(s) for this operation +ERROR 42000: Access denied; you need (at least one of) the CONNECTION ADMIN privilege(s) for this operation SET connect_timeout=10; ERROR HY000: Variable 'connect_timeout' is a GLOBAL variable and should be set with SET GLOBAL SET SESSION connect_timeout=10; @@ -30,17 +30,4 @@ ERROR HY000: Variable 'connect_timeout' is a GLOBAL variable and should be set w disconnect user1; connection default; DROP USER user1@localhost; -# Test that "SET connect_timeout" is allowed with SUPER -CREATE USER user1@localhost; -GRANT SUPER ON *.* TO user1@localhost; -connect user1,localhost,user1,,; -connection user1; -SET GLOBAL connect_timeout=10; -SET connect_timeout=10; -ERROR HY000: Variable 'connect_timeout' is a GLOBAL variable and should be set with SET GLOBAL -SET SESSION connect_timeout=10; -ERROR HY000: Variable 'connect_timeout' is a GLOBAL variable and should be set with SET GLOBAL -disconnect user1; -connection default; -DROP USER user1@localhost; SET @@global.connect_timeout=@global; diff --git a/mysql-test/suite/sys_vars/r/date_format_basic.result b/mysql-test/suite/sys_vars/r/date_format_basic.result deleted file mode 100644 index a92d275d..00000000 --- a/mysql-test/suite/sys_vars/r/date_format_basic.result +++ /dev/null @@ -1,21 +0,0 @@ -select @@global.date_format; -@@global.date_format -%Y-%m-%d -select @@session.date_format; -ERROR HY000: Variable 'date_format' is a GLOBAL variable -show global variables like 'date_format'; -Variable_name Value -date_format %Y-%m-%d -show session variables like 'date_format'; -Variable_name Value -date_format %Y-%m-%d -select * from information_schema.global_variables where variable_name='date_format'; -VARIABLE_NAME VARIABLE_VALUE -DATE_FORMAT %Y-%m-%d -select * from information_schema.session_variables where variable_name='date_format'; -VARIABLE_NAME VARIABLE_VALUE -DATE_FORMAT %Y-%m-%d -set global date_format="foo"; -ERROR HY000: Variable 'date_format' is a read only variable -set session date_format="foo"; -ERROR HY000: Variable 'date_format' is a read only variable diff --git a/mysql-test/suite/sys_vars/r/datetime_format_basic.result b/mysql-test/suite/sys_vars/r/datetime_format_basic.result deleted file mode 100644 index ac80ee37..00000000 --- a/mysql-test/suite/sys_vars/r/datetime_format_basic.result +++ /dev/null @@ -1,21 +0,0 @@ -select @@global.datetime_format; -@@global.datetime_format -%Y-%m-%d %H:%i:%s -select @@session.datetime_format; -ERROR HY000: Variable 'datetime_format' is a GLOBAL variable -show global variables like 'datetime_format'; -Variable_name Value -datetime_format %Y-%m-%d %H:%i:%s -show session variables like 'datetime_format'; -Variable_name Value -datetime_format %Y-%m-%d %H:%i:%s -select * from information_schema.global_variables where variable_name='datetime_format'; -VARIABLE_NAME VARIABLE_VALUE -DATETIME_FORMAT %Y-%m-%d %H:%i:%s -select * from information_schema.session_variables where variable_name='datetime_format'; -VARIABLE_NAME VARIABLE_VALUE -DATETIME_FORMAT %Y-%m-%d %H:%i:%s -set global datetime_format="foo"; -ERROR HY000: Variable 'datetime_format' is a read only variable -set session datetime_format="foo"; -ERROR HY000: Variable 'datetime_format' is a read only variable diff --git a/mysql-test/suite/sys_vars/r/debug_basic.result b/mysql-test/suite/sys_vars/r/debug_basic.result deleted file mode 100644 index 5a77446d..00000000 --- a/mysql-test/suite/sys_vars/r/debug_basic.result +++ /dev/null @@ -1,25 +0,0 @@ -set session debug="L"; -select @@global.debug="1"; -@@global.debug="1" -0 -select @@session.debug; -@@session.debug -L -show global variables like 'debug'; -Variable_name Value -debug # -show session variables like 'debug'; -Variable_name Value -debug L -select * from information_schema.global_variables where variable_name="debug"; -VARIABLE_NAME VARIABLE_VALUE -DEBUG # -select * from information_schema.session_variables where variable_name="debug"; -VARIABLE_NAME VARIABLE_VALUE -DEBUG L -set @@global.debug=1; -ERROR 42000: Incorrect argument type to variable 'debug' -set @@global.debug=1.1; -ERROR 42000: Incorrect argument type to variable 'debug' -set @@global.debug=1e1; -ERROR 42000: Incorrect argument type to variable 'debug' diff --git a/mysql-test/suite/sys_vars/r/debug_dbug_basic.result b/mysql-test/suite/sys_vars/r/debug_dbug_basic.result index ad2fbc5a..091f8ed3 100644 --- a/mysql-test/suite/sys_vars/r/debug_dbug_basic.result +++ b/mysql-test/suite/sys_vars/r/debug_dbug_basic.result @@ -2,21 +2,21 @@ set session debug_dbug="L"; select @@global.debug_dbug="1"; @@global.debug_dbug="1" 0 -select @@session.debug; -@@session.debug +select @@session.debug_dbug; +@@session.debug_dbug L -show global variables like 'debug'; +show global variables like 'debug_dbug'; Variable_name Value -debug # -show session variables like 'debug'; +debug_dbug # +show session variables like 'debug_dbug'; Variable_name Value -debug L -select * from information_schema.global_variables where variable_name="debug"; +debug_dbug L +select * from information_schema.global_variables where variable_name='debug_dbug'; VARIABLE_NAME VARIABLE_VALUE -DEBUG # -select * from information_schema.session_variables where variable_name="debug"; +DEBUG_DBUG # +select * from information_schema.session_variables where variable_name='debug_dbug'; VARIABLE_NAME VARIABLE_VALUE -DEBUG L +DEBUG_DBUG L set @@global.debug_dbug=1; ERROR 42000: Incorrect argument type to variable 'debug_dbug' set @@global.debug_dbug=1.1; diff --git a/mysql-test/suite/sys_vars/r/debug_dbug_func_notembedded.result b/mysql-test/suite/sys_vars/r/debug_dbug_func_notembedded.result index 45de298e..7f8c0709 100644 --- a/mysql-test/suite/sys_vars/r/debug_dbug_func_notembedded.result +++ b/mysql-test/suite/sys_vars/r/debug_dbug_func_notembedded.result @@ -2,23 +2,23 @@ connect con1,localhost,root,,test,,; connect con2,localhost,root,,test,,; connection con1; set session debug_dbug="t"; -show session variables like 'debug'; +show session variables like 'debug_dbug'; Variable_name Value -debug t +debug_dbug t connection con2; set session debug_dbug="t"; -show session variables like 'debug'; +show session variables like 'debug_dbug'; Variable_name Value -debug t +debug_dbug t connection con1; set session debug_dbug="d:t"; -show session variables like 'debug'; +show session variables like 'debug_dbug'; Variable_name Value -debug d:t +debug_dbug d:t connection con2; -show session variables like 'debug'; +show session variables like 'debug_dbug'; Variable_name Value -debug t +debug_dbug t disconnect con1; disconnect con2; connection default; diff --git a/mysql-test/suite/sys_vars/r/debug_no_thread_alarm_basic.result b/mysql-test/suite/sys_vars/r/debug_no_thread_alarm_basic.result deleted file mode 100644 index 817c7880..00000000 --- a/mysql-test/suite/sys_vars/r/debug_no_thread_alarm_basic.result +++ /dev/null @@ -1,21 +0,0 @@ -select @@global.debug_no_thread_alarm; -@@global.debug_no_thread_alarm -0 -select @@session.debug_no_thread_alarm; -ERROR HY000: Variable 'debug_no_thread_alarm' is a GLOBAL variable -show global variables like 'debug_no_thread_alarm'; -Variable_name Value -debug_no_thread_alarm OFF -show session variables like 'debug_no_thread_alarm'; -Variable_name Value -debug_no_thread_alarm OFF -select * from information_schema.global_variables where variable_name='debug_no_thread_alarm'; -VARIABLE_NAME VARIABLE_VALUE -DEBUG_NO_THREAD_ALARM OFF -select * from information_schema.session_variables where variable_name='debug_no_thread_alarm'; -VARIABLE_NAME VARIABLE_VALUE -DEBUG_NO_THREAD_ALARM OFF -set global debug_no_thread_alarm=1; -ERROR HY000: Variable 'debug_no_thread_alarm' is a read only variable -set session debug_no_thread_alarm=1; -ERROR HY000: Variable 'debug_no_thread_alarm' is a read only variable diff --git a/mysql-test/suite/sys_vars/r/disconnect_on_expired_password_grant.result b/mysql-test/suite/sys_vars/r/disconnect_on_expired_password_grant.result index b7152351..e3bc2754 100644 --- a/mysql-test/suite/sys_vars/r/disconnect_on_expired_password_grant.result +++ b/mysql-test/suite/sys_vars/r/disconnect_on_expired_password_grant.result @@ -2,14 +2,14 @@ SET @global=@@global.disconnect_on_expired_password; # # MDEV-21961 Bind CONNECTION ADMIN to a number of global system variables # -# Test that "SET disconnect_on_expired_password" is not allowed without CONNECTION ADMIN or SUPER +# Test that "SET disconnect_on_expired_password" is not allowed without CONNECTION ADMIN CREATE USER user1@localhost; GRANT ALL PRIVILEGES ON *.* TO user1@localhost; -REVOKE CONNECTION ADMIN, SUPER ON *.* FROM user1@localhost; +REVOKE CONNECTION ADMIN ON *.* FROM user1@localhost; connect user1,localhost,user1,,; connection user1; SET GLOBAL disconnect_on_expired_password=1; -ERROR 42000: Access denied; you need (at least one of) the SUPER, CONNECTION ADMIN privilege(s) for this operation +ERROR 42000: Access denied; you need (at least one of) the CONNECTION ADMIN privilege(s) for this operation SET disconnect_on_expired_password=1; ERROR HY000: Variable 'disconnect_on_expired_password' is a GLOBAL variable and should be set with SET GLOBAL SET SESSION disconnect_on_expired_password=1; @@ -30,17 +30,4 @@ ERROR HY000: Variable 'disconnect_on_expired_password' is a GLOBAL variable and disconnect user1; connection default; DROP USER user1@localhost; -# Test that "SET disconnect_on_expired_password" is allowed with SUPER -CREATE USER user1@localhost; -GRANT SUPER ON *.* TO user1@localhost; -connect user1,localhost,user1,,; -connection user1; -SET GLOBAL disconnect_on_expired_password=1; -SET disconnect_on_expired_password=1; -ERROR HY000: Variable 'disconnect_on_expired_password' is a GLOBAL variable and should be set with SET GLOBAL -SET SESSION disconnect_on_expired_password=1; -ERROR HY000: Variable 'disconnect_on_expired_password' is a GLOBAL variable and should be set with SET GLOBAL -disconnect user1; -connection default; -DROP USER user1@localhost; SET @@global.disconnect_on_expired_password=@global; diff --git a/mysql-test/suite/sys_vars/r/expire_logs_days_grant.result b/mysql-test/suite/sys_vars/r/expire_logs_days_grant.result index f7a3ddc7..4dcff017 100644 --- a/mysql-test/suite/sys_vars/r/expire_logs_days_grant.result +++ b/mysql-test/suite/sys_vars/r/expire_logs_days_grant.result @@ -2,14 +2,14 @@ # MDEV-21963 Bind BINLOG ADMIN to a number of global system variables # SET @global=@@global.expire_logs_days; -# Test that "SET expire_logs_days" is not allowed without BINLOG ADMIN or SUPER +# Test that "SET expire_logs_days" is not allowed without BINLOG ADMIN CREATE USER user1@localhost; GRANT ALL PRIVILEGES ON *.* TO user1@localhost; -REVOKE BINLOG ADMIN, SUPER ON *.* FROM user1@localhost; +REVOKE BINLOG ADMIN ON *.* FROM user1@localhost; connect user1,localhost,user1,,; connection user1; SET GLOBAL expire_logs_days=33; -ERROR 42000: Access denied; you need (at least one of) the SUPER, BINLOG ADMIN privilege(s) for this operation +ERROR 42000: Access denied; you need (at least one of) the BINLOG ADMIN privilege(s) for this operation SET expire_logs_days=33; ERROR HY000: Variable 'expire_logs_days' is a GLOBAL variable and should be set with SET GLOBAL SET SESSION expire_logs_days=33; @@ -30,17 +30,4 @@ ERROR HY000: Variable 'expire_logs_days' is a GLOBAL variable and should be set disconnect user1; connection default; DROP USER user1@localhost; -# Test that "SET expire_logs_days" is allowed with SUPER -CREATE USER user1@localhost; -GRANT SUPER ON *.* TO user1@localhost; -connect user1,localhost,user1,,; -connection user1; -SET GLOBAL expire_logs_days=33; -SET expire_logs_days=33; -ERROR HY000: Variable 'expire_logs_days' is a GLOBAL variable and should be set with SET GLOBAL -SET SESSION expire_logs_days=33; -ERROR HY000: Variable 'expire_logs_days' is a GLOBAL variable and should be set with SET GLOBAL -disconnect user1; -connection default; -DROP USER user1@localhost; SET @@global.expire_logs_days=@global; diff --git a/mysql-test/suite/sys_vars/r/explicit_defaults_for_timestamp_off.result b/mysql-test/suite/sys_vars/r/explicit_defaults_for_timestamp_off.result index 1d779352..7cdf564c 100644 --- a/mysql-test/suite/sys_vars/r/explicit_defaults_for_timestamp_off.result +++ b/mysql-test/suite/sys_vars/r/explicit_defaults_for_timestamp_off.result @@ -1,4 +1,6 @@ set @@explicit_defaults_for_timestamp=0; +Warnings: +Warning 1287 'explicit_defaults_for_timestamp=0' is deprecated and will be removed in a future release CREATE TABLE t1 (a TIMESTAMP); SHOW CREATE TABLE t1; Table Create Table @@ -224,6 +226,8 @@ t1 CREATE TABLE `t1` ( `a` timestamp NULL DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci set explicit_defaults_for_timestamp=1-@@explicit_defaults_for_timestamp; +Warnings: +Warning 1287 'explicit_defaults_for_timestamp=0' is deprecated and will be removed in a future release execute stmt; show create table t1; Table Create Table diff --git a/mysql-test/suite/sys_vars/r/explicit_defaults_for_timestamp_on.result b/mysql-test/suite/sys_vars/r/explicit_defaults_for_timestamp_on.result index 85cbfbc2..cbb4834d 100644 --- a/mysql-test/suite/sys_vars/r/explicit_defaults_for_timestamp_on.result +++ b/mysql-test/suite/sys_vars/r/explicit_defaults_for_timestamp_on.result @@ -233,6 +233,8 @@ t1 CREATE TABLE `t1` ( `a` timestamp NULL DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci set explicit_defaults_for_timestamp=1-@@explicit_defaults_for_timestamp; +Warnings: +Warning 1287 'explicit_defaults_for_timestamp=0' is deprecated and will be removed in a future release execute stmt; show create table t1; Table Create Table diff --git a/mysql-test/suite/sys_vars/r/extra_max_connections_grant.result b/mysql-test/suite/sys_vars/r/extra_max_connections_grant.result index 2f211dd5..2663cfad 100644 --- a/mysql-test/suite/sys_vars/r/extra_max_connections_grant.result +++ b/mysql-test/suite/sys_vars/r/extra_max_connections_grant.result @@ -2,14 +2,14 @@ SET @global=@@global.extra_max_connections; # # MDEV-21961 Bind CONNECTION ADMIN to a number of global system variables # -# Test that "SET extra_max_connections" is not allowed without CONNECTION ADMIN or SUPER +# Test that "SET extra_max_connections" is not allowed without CONNECTION ADMIN CREATE USER user1@localhost; GRANT ALL PRIVILEGES ON *.* TO user1@localhost; -REVOKE CONNECTION ADMIN, SUPER ON *.* FROM user1@localhost; +REVOKE CONNECTION ADMIN ON *.* FROM user1@localhost; connect user1,localhost,user1,,; connection user1; SET GLOBAL extra_max_connections=10; -ERROR 42000: Access denied; you need (at least one of) the SUPER, CONNECTION ADMIN privilege(s) for this operation +ERROR 42000: Access denied; you need (at least one of) the CONNECTION ADMIN privilege(s) for this operation SET extra_max_connections=10; ERROR HY000: Variable 'extra_max_connections' is a GLOBAL variable and should be set with SET GLOBAL SET SESSION extra_max_connections=10; @@ -30,17 +30,4 @@ ERROR HY000: Variable 'extra_max_connections' is a GLOBAL variable and should be disconnect user1; connection default; DROP USER user1@localhost; -# Test that "SET extra_max_connections" is allowed with SUPER -CREATE USER user1@localhost; -GRANT SUPER ON *.* TO user1@localhost; -connect user1,localhost,user1,,; -connection user1; -SET GLOBAL extra_max_connections=10; -SET extra_max_connections=10; -ERROR HY000: Variable 'extra_max_connections' is a GLOBAL variable and should be set with SET GLOBAL -SET SESSION extra_max_connections=10; -ERROR HY000: Variable 'extra_max_connections' is a GLOBAL variable and should be set with SET GLOBAL -disconnect user1; -connection default; -DROP USER user1@localhost; SET @@global.extra_max_connections=@global; diff --git a/mysql-test/suite/sys_vars/r/gtid_binlog_state_grant.result b/mysql-test/suite/sys_vars/r/gtid_binlog_state_grant.result index 0ccf610c..4aa0a800 100644 --- a/mysql-test/suite/sys_vars/r/gtid_binlog_state_grant.result +++ b/mysql-test/suite/sys_vars/r/gtid_binlog_state_grant.result @@ -1,14 +1,14 @@ # # MDEV-21973 Bind REPLICATION {MASTER|SLAVE} ADMIN to gtid_* GLOBAL-only system variables # -# Test that "SET gtid_binlog_state" is not allowed without REPLICATION MASTER ADMIN or SUPER +# Test that "SET gtid_binlog_state" is not allowed without REPLICATION MASTER ADMIN CREATE USER user1@localhost; GRANT ALL PRIVILEGES ON *.* TO user1@localhost; -REVOKE REPLICATION MASTER ADMIN, SUPER ON *.* FROM user1@localhost; +REVOKE REPLICATION MASTER ADMIN ON *.* FROM user1@localhost; connect user1,localhost,user1,,; connection user1; SET GLOBAL gtid_binlog_state='0-1-10'; -ERROR 42000: Access denied; you need (at least one of) the SUPER, REPLICATION MASTER ADMIN privilege(s) for this operation +ERROR 42000: Access denied; you need (at least one of) the REPLICATION MASTER ADMIN privilege(s) for this operation SET gtid_binlog_state='0-1-10'; ERROR HY000: Variable 'gtid_binlog_state' is a GLOBAL variable and should be set with SET GLOBAL SET SESSION gtid_binlog_state='0-1-10'; @@ -30,17 +30,3 @@ ERROR HY000: Variable 'gtid_binlog_state' is a GLOBAL variable and should be set disconnect user1; connection default; DROP USER user1@localhost; -# Test that "SET gtid_binlog_state" is allowed with SUPER -CREATE USER user1@localhost; -GRANT SUPER ON *.* TO user1@localhost; -connect user1,localhost,user1,,; -connection user1; -SET GLOBAL gtid_binlog_state='0-1-10'; -ERROR HY000: Binlog closed, cannot RESET MASTER -SET gtid_binlog_state='0-1-10'; -ERROR HY000: Variable 'gtid_binlog_state' is a GLOBAL variable and should be set with SET GLOBAL -SET SESSION gtid_binlog_state='0-1-10'; -ERROR HY000: Variable 'gtid_binlog_state' is a GLOBAL variable and should be set with SET GLOBAL -disconnect user1; -connection default; -DROP USER user1@localhost; diff --git a/mysql-test/suite/sys_vars/r/gtid_cleanup_batch_size_grant.result b/mysql-test/suite/sys_vars/r/gtid_cleanup_batch_size_grant.result index 326fb47d..33a39d1c 100644 --- a/mysql-test/suite/sys_vars/r/gtid_cleanup_batch_size_grant.result +++ b/mysql-test/suite/sys_vars/r/gtid_cleanup_batch_size_grant.result @@ -2,14 +2,14 @@ # MDEV-21973 Bind REPLICATION {MASTER|SLAVE} ADMIN to gtid_* GLOBAL-only system variables # SET @global=@@global.gtid_cleanup_batch_size; -# Test that "SET gtid_cleanup_batch_size" is not allowed without REPLICATION SLAVE ADMIN or SUPER +# Test that "SET gtid_cleanup_batch_size" is not allowed without REPLICATION SLAVE ADMIN CREATE USER user1@localhost; GRANT ALL PRIVILEGES ON *.* TO user1@localhost; -REVOKE REPLICATION SLAVE ADMIN, SUPER ON *.* FROM user1@localhost; +REVOKE REPLICATION SLAVE ADMIN ON *.* FROM user1@localhost; connect user1,localhost,user1,,; connection user1; SET GLOBAL gtid_cleanup_batch_size=1; -ERROR 42000: Access denied; you need (at least one of) the SUPER, REPLICATION SLAVE ADMIN privilege(s) for this operation +ERROR 42000: Access denied; you need (at least one of) the REPLICATION SLAVE ADMIN privilege(s) for this operation SET gtid_cleanup_batch_size=1; ERROR HY000: Variable 'gtid_cleanup_batch_size' is a GLOBAL variable and should be set with SET GLOBAL SET SESSION gtid_cleanup_batch_size=1; @@ -30,17 +30,4 @@ ERROR HY000: Variable 'gtid_cleanup_batch_size' is a GLOBAL variable and should disconnect user1; connection default; DROP USER user1@localhost; -# Test that "SET gtid_cleanup_batch_size" is allowed with SUPER -CREATE USER user1@localhost; -GRANT SUPER ON *.* TO user1@localhost; -connect user1,localhost,user1,,; -connection user1; -SET GLOBAL gtid_cleanup_batch_size=1; -SET gtid_cleanup_batch_size=1; -ERROR HY000: Variable 'gtid_cleanup_batch_size' is a GLOBAL variable and should be set with SET GLOBAL -SET SESSION gtid_cleanup_batch_size=1; -ERROR HY000: Variable 'gtid_cleanup_batch_size' is a GLOBAL variable and should be set with SET GLOBAL -disconnect user1; -connection default; -DROP USER user1@localhost; SET @@global.gtid_cleanup_batch_size=@global; diff --git a/mysql-test/suite/sys_vars/r/gtid_domain_id_grant.result b/mysql-test/suite/sys_vars/r/gtid_domain_id_grant.result index 096f5136..9d1ac3de 100644 --- a/mysql-test/suite/sys_vars/r/gtid_domain_id_grant.result +++ b/mysql-test/suite/sys_vars/r/gtid_domain_id_grant.result @@ -2,14 +2,14 @@ # MDEV-21975 Add BINLOG REPLAY privilege and bind new privileges to gtid_seq_no, preudo_thread_id, server_id, gtid_domain_id # SET @global=@@global.gtid_domain_id; -# Test that "SET GLOBAL gtid_domain_id" is not allowed without REPLICATION MASTER ADMIN or SUPER +# Test that "SET GLOBAL gtid_domain_id" is not allowed without REPLICATION MASTER ADMIN CREATE USER user1@localhost; GRANT ALL PRIVILEGES ON *.* TO user1@localhost; -REVOKE REPLICATION MASTER ADMIN, SUPER ON *.* FROM user1@localhost; +REVOKE REPLICATION MASTER ADMIN ON *.* FROM user1@localhost; connect user1,localhost,user1,,; connection user1; SET GLOBAL gtid_domain_id=1; -ERROR 42000: Access denied; you need (at least one of) the SUPER, REPLICATION MASTER ADMIN privilege(s) for this operation +ERROR 42000: Access denied; you need (at least one of) the REPLICATION MASTER ADMIN privilege(s) for this operation disconnect user1; connection default; DROP USER user1@localhost; @@ -22,27 +22,18 @@ SET GLOBAL gtid_domain_id=1; disconnect user1; connection default; DROP USER user1@localhost; -# Test that "SET GLOBAL gtid_domain_id" is allowed with SUPER -CREATE USER user1@localhost; -GRANT SUPER ON *.* TO user1@localhost; -connect user1,localhost,user1,,; -connection user1; -SET GLOBAL gtid_domain_id=1; -disconnect user1; -connection default; -DROP USER user1@localhost; SET @@global.gtid_domain_id=@global; SET @session=@@session.gtid_domain_id; -# Test that "SET gtid_domain_id" is not allowed without BINLOG REPLAY or SUPER +# Test that "SET gtid_domain_id" is not allowed without BINLOG REPLAY CREATE USER user1@localhost; GRANT ALL PRIVILEGES ON *.* TO user1@localhost; -REVOKE BINLOG REPLAY, SUPER ON *.* FROM user1@localhost; +REVOKE BINLOG REPLAY ON *.* FROM user1@localhost; connect user1,localhost,user1,,; connection user1; SET gtid_domain_id=1; -ERROR 42000: Access denied; you need (at least one of) the SUPER, BINLOG REPLAY privilege(s) for this operation +ERROR 42000: Access denied; you need (at least one of) the BINLOG REPLAY privilege(s) for this operation SET SESSION gtid_domain_id=1; -ERROR 42000: Access denied; you need (at least one of) the SUPER, BINLOG REPLAY privilege(s) for this operation +ERROR 42000: Access denied; you need (at least one of) the BINLOG REPLAY privilege(s) for this operation disconnect user1; connection default; DROP USER user1@localhost; @@ -56,14 +47,4 @@ SET SESSION gtid_domain_id=1; disconnect user1; connection default; DROP USER user1@localhost; -# Test that "SET gtid_domain_id" is allowed with SUPER -CREATE USER user1@localhost; -GRANT SUPER ON *.* TO user1@localhost; -connect user1,localhost,user1,,; -connection user1; -SET gtid_domain_id=1; -SET SESSION gtid_domain_id=1; -disconnect user1; -connection default; -DROP USER user1@localhost; SET @@session.gtid_domain_id=@session; diff --git a/mysql-test/suite/sys_vars/r/gtid_ignore_duplicates_grant.result b/mysql-test/suite/sys_vars/r/gtid_ignore_duplicates_grant.result index f4c95fb6..ed6faac5 100644 --- a/mysql-test/suite/sys_vars/r/gtid_ignore_duplicates_grant.result +++ b/mysql-test/suite/sys_vars/r/gtid_ignore_duplicates_grant.result @@ -2,14 +2,14 @@ # MDEV-21973 Bind REPLICATION {MASTER|SLAVE} ADMIN to gtid_* GLOBAL-only system variables # SET @global=@@global.gtid_ignore_duplicates; -# Test that "SET gtid_ignore_duplicates" is not allowed without REPLICATION SLAVE ADMIN or SUPER +# Test that "SET gtid_ignore_duplicates" is not allowed without REPLICATION SLAVE ADMIN CREATE USER user1@localhost; GRANT ALL PRIVILEGES ON *.* TO user1@localhost; -REVOKE REPLICATION SLAVE ADMIN, SUPER ON *.* FROM user1@localhost; +REVOKE REPLICATION SLAVE ADMIN ON *.* FROM user1@localhost; connect user1,localhost,user1,,; connection user1; SET GLOBAL gtid_ignore_duplicates=1; -ERROR 42000: Access denied; you need (at least one of) the SUPER, REPLICATION SLAVE ADMIN privilege(s) for this operation +ERROR 42000: Access denied; you need (at least one of) the REPLICATION SLAVE ADMIN privilege(s) for this operation SET gtid_ignore_duplicates=1; ERROR HY000: Variable 'gtid_ignore_duplicates' is a GLOBAL variable and should be set with SET GLOBAL SET SESSION gtid_ignore_duplicates=1; @@ -30,17 +30,4 @@ ERROR HY000: Variable 'gtid_ignore_duplicates' is a GLOBAL variable and should b disconnect user1; connection default; DROP USER user1@localhost; -# Test that "SET gtid_ignore_duplicates" is allowed with SUPER -CREATE USER user1@localhost; -GRANT SUPER ON *.* TO user1@localhost; -connect user1,localhost,user1,,; -connection user1; -SET GLOBAL gtid_ignore_duplicates=1; -SET gtid_ignore_duplicates=1; -ERROR HY000: Variable 'gtid_ignore_duplicates' is a GLOBAL variable and should be set with SET GLOBAL -SET SESSION gtid_ignore_duplicates=1; -ERROR HY000: Variable 'gtid_ignore_duplicates' is a GLOBAL variable and should be set with SET GLOBAL -disconnect user1; -connection default; -DROP USER user1@localhost; SET @@global.gtid_ignore_duplicates=@global; diff --git a/mysql-test/suite/sys_vars/r/gtid_pos_auto_engines_grant.result b/mysql-test/suite/sys_vars/r/gtid_pos_auto_engines_grant.result index 60fae07c..f3ee0179 100644 --- a/mysql-test/suite/sys_vars/r/gtid_pos_auto_engines_grant.result +++ b/mysql-test/suite/sys_vars/r/gtid_pos_auto_engines_grant.result @@ -2,14 +2,14 @@ # MDEV-21973 Bind REPLICATION {MASTER|SLAVE} ADMIN to gtid_* GLOBAL-only system variables # SET @global=@@global.gtid_pos_auto_engines; -# Test that "SET gtid_pos_auto_engines" is not allowed without REPLICATION SLAVE ADMIN or SUPER +# Test that "SET gtid_pos_auto_engines" is not allowed without REPLICATION SLAVE ADMIN CREATE USER user1@localhost; GRANT ALL PRIVILEGES ON *.* TO user1@localhost; -REVOKE REPLICATION SLAVE ADMIN, SUPER ON *.* FROM user1@localhost; +REVOKE REPLICATION SLAVE ADMIN ON *.* FROM user1@localhost; connect user1,localhost,user1,,; connection user1; SET GLOBAL gtid_pos_auto_engines=''; -ERROR 42000: Access denied; you need (at least one of) the SUPER, REPLICATION SLAVE ADMIN privilege(s) for this operation +ERROR 42000: Access denied; you need (at least one of) the REPLICATION SLAVE ADMIN privilege(s) for this operation SET gtid_pos_auto_engines=''; ERROR HY000: Variable 'gtid_pos_auto_engines' is a GLOBAL variable and should be set with SET GLOBAL SET SESSION gtid_pos_auto_engines=''; @@ -30,17 +30,4 @@ ERROR HY000: Variable 'gtid_pos_auto_engines' is a GLOBAL variable and should be disconnect user1; connection default; DROP USER user1@localhost; -# Test that "SET gtid_pos_auto_engines" is allowed with SUPER -CREATE USER user1@localhost; -GRANT SUPER ON *.* TO user1@localhost; -connect user1,localhost,user1,,; -connection user1; -SET GLOBAL gtid_pos_auto_engines=''; -SET gtid_pos_auto_engines=''; -ERROR HY000: Variable 'gtid_pos_auto_engines' is a GLOBAL variable and should be set with SET GLOBAL -SET SESSION gtid_pos_auto_engines=''; -ERROR HY000: Variable 'gtid_pos_auto_engines' is a GLOBAL variable and should be set with SET GLOBAL -disconnect user1; -connection default; -DROP USER user1@localhost; SET @@global.gtid_pos_auto_engines=@global; diff --git a/mysql-test/suite/sys_vars/r/gtid_seq_no_grant.result b/mysql-test/suite/sys_vars/r/gtid_seq_no_grant.result index 0d08cde5..d8a5d976 100644 --- a/mysql-test/suite/sys_vars/r/gtid_seq_no_grant.result +++ b/mysql-test/suite/sys_vars/r/gtid_seq_no_grant.result @@ -2,18 +2,18 @@ # MDEV-21975 Add BINLOG REPLAY privilege and bind new privileges to gtid_seq_no, preudo_thread_id, server_id, gtid_domain_id # SET @session=@@session.gtid_seq_no; -# Test that "SET gtid_seq_no" is not allowed without BINLOG REPLAY or SUPER +# Test that "SET gtid_seq_no" is not allowed without BINLOG REPLAY CREATE USER user1@localhost; GRANT ALL PRIVILEGES ON *.* TO user1@localhost; -REVOKE BINLOG REPLAY, SUPER ON *.* FROM user1@localhost; +REVOKE BINLOG REPLAY ON *.* FROM user1@localhost; connect user1,localhost,user1,,; connection user1; SET GLOBAL gtid_seq_no=1; ERROR HY000: Variable 'gtid_seq_no' is a SESSION variable and can't be used with SET GLOBAL SET gtid_seq_no=1; -ERROR 42000: Access denied; you need (at least one of) the SUPER, BINLOG REPLAY privilege(s) for this operation +ERROR 42000: Access denied; you need (at least one of) the BINLOG REPLAY privilege(s) for this operation SET SESSION gtid_seq_no=1; -ERROR 42000: Access denied; you need (at least one of) the SUPER, BINLOG REPLAY privilege(s) for this operation +ERROR 42000: Access denied; you need (at least one of) the BINLOG REPLAY privilege(s) for this operation disconnect user1; connection default; DROP USER user1@localhost; @@ -29,16 +29,4 @@ SET SESSION gtid_seq_no=1; disconnect user1; connection default; DROP USER user1@localhost; -# Test that "SET gtid_seq_no" is allowed with SUPER -CREATE USER user1@localhost; -GRANT SUPER ON *.* TO user1@localhost; -connect user1,localhost,user1,,; -connection user1; -SET GLOBAL gtid_seq_no=1; -ERROR HY000: Variable 'gtid_seq_no' is a SESSION variable and can't be used with SET GLOBAL -SET gtid_seq_no=1; -SET SESSION gtid_seq_no=1; -disconnect user1; -connection default; -DROP USER user1@localhost; SET @@session.gtid_seq_no=@session; diff --git a/mysql-test/suite/sys_vars/r/gtid_slave_pos_grant.result b/mysql-test/suite/sys_vars/r/gtid_slave_pos_grant.result index 52918706..dfad91fb 100644 --- a/mysql-test/suite/sys_vars/r/gtid_slave_pos_grant.result +++ b/mysql-test/suite/sys_vars/r/gtid_slave_pos_grant.result @@ -2,14 +2,14 @@ # MDEV-21973 Bind REPLICATION {MASTER|SLAVE} ADMIN to gtid_* GLOBAL-only system variables # SET @global=@@global.gtid_slave_pos; -# Test that "SET gtid_slave_pos" is not allowed without REPLICATION SLAVE ADMIN or SUPER +# Test that "SET gtid_slave_pos" is not allowed without REPLICATION SLAVE ADMIN CREATE USER user1@localhost; GRANT ALL PRIVILEGES ON *.* TO user1@localhost; -REVOKE REPLICATION SLAVE ADMIN, SUPER ON *.* FROM user1@localhost; +REVOKE REPLICATION SLAVE ADMIN ON *.* FROM user1@localhost; connect user1,localhost,user1,,; connection user1; SET GLOBAL gtid_slave_pos=''; -ERROR 42000: Access denied; you need (at least one of) the SUPER, REPLICATION SLAVE ADMIN privilege(s) for this operation +ERROR 42000: Access denied; you need (at least one of) the REPLICATION SLAVE ADMIN privilege(s) for this operation SET gtid_slave_pos=''; ERROR HY000: Variable 'gtid_slave_pos' is a GLOBAL variable and should be set with SET GLOBAL SET SESSION gtid_slave_pos=''; @@ -30,17 +30,4 @@ ERROR HY000: Variable 'gtid_slave_pos' is a GLOBAL variable and should be set wi disconnect user1; connection default; DROP USER user1@localhost; -# Test that "SET gtid_slave_pos" is allowed with SUPER -CREATE USER user1@localhost; -GRANT SUPER ON *.* TO user1@localhost; -connect user1,localhost,user1,,; -connection user1; -SET GLOBAL gtid_slave_pos=''; -SET gtid_slave_pos=''; -ERROR HY000: Variable 'gtid_slave_pos' is a GLOBAL variable and should be set with SET GLOBAL -SET SESSION gtid_slave_pos=''; -ERROR HY000: Variable 'gtid_slave_pos' is a GLOBAL variable and should be set with SET GLOBAL -disconnect user1; -connection default; -DROP USER user1@localhost; SET @@global.gtid_slave_pos=@global; diff --git a/mysql-test/suite/sys_vars/r/gtid_strict_mode_grant.result b/mysql-test/suite/sys_vars/r/gtid_strict_mode_grant.result index 0ea4d0ab..8744d743 100644 --- a/mysql-test/suite/sys_vars/r/gtid_strict_mode_grant.result +++ b/mysql-test/suite/sys_vars/r/gtid_strict_mode_grant.result @@ -2,14 +2,14 @@ # MDEV-21973 Bind REPLICATION {MASTER|SLAVE} ADMIN to gtid_* GLOBAL-only system variables # SET @global=@@global.gtid_strict_mode; -# Test that "SET gtid_strict_mode" is not allowed without REPLICATION SLAVE ADMIN or SUPER +# Test that "SET gtid_strict_mode" is not allowed without REPLICATION SLAVE ADMIN CREATE USER user1@localhost; GRANT ALL PRIVILEGES ON *.* TO user1@localhost; -REVOKE REPLICATION SLAVE ADMIN, SUPER ON *.* FROM user1@localhost; +REVOKE REPLICATION SLAVE ADMIN ON *.* FROM user1@localhost; connect user1,localhost,user1,,; connection user1; SET GLOBAL gtid_strict_mode=1; -ERROR 42000: Access denied; you need (at least one of) the SUPER, REPLICATION SLAVE ADMIN privilege(s) for this operation +ERROR 42000: Access denied; you need (at least one of) the REPLICATION SLAVE ADMIN privilege(s) for this operation SET gtid_strict_mode=1; ERROR HY000: Variable 'gtid_strict_mode' is a GLOBAL variable and should be set with SET GLOBAL SET SESSION gtid_strict_mode=1; @@ -30,17 +30,4 @@ ERROR HY000: Variable 'gtid_strict_mode' is a GLOBAL variable and should be set disconnect user1; connection default; DROP USER user1@localhost; -# Test that "SET gtid_strict_mode" is allowed with SUPER -CREATE USER user1@localhost; -GRANT SUPER ON *.* TO user1@localhost; -connect user1,localhost,user1,,; -connection user1; -SET GLOBAL gtid_strict_mode=1; -SET gtid_strict_mode=1; -ERROR HY000: Variable 'gtid_strict_mode' is a GLOBAL variable and should be set with SET GLOBAL -SET SESSION gtid_strict_mode=1; -ERROR HY000: Variable 'gtid_strict_mode' is a GLOBAL variable and should be set with SET GLOBAL -disconnect user1; -connection default; -DROP USER user1@localhost; SET @@global.gtid_strict_mode=@global; diff --git a/mysql-test/suite/sys_vars/r/histogram_type_basic.result b/mysql-test/suite/sys_vars/r/histogram_type_basic.result index c2419200..8dbd3251 100644 --- a/mysql-test/suite/sys_vars/r/histogram_type_basic.result +++ b/mysql-test/suite/sys_vars/r/histogram_type_basic.result @@ -10,7 +10,7 @@ SET @@global.histogram_type = 1; SET @@global.histogram_type = DEFAULT; SELECT @@global.histogram_type; @@global.histogram_type -DOUBLE_PREC_HB +JSON_HB SET @@global.histogram_type = 0; SELECT @@global.histogram_type; @@global.histogram_type diff --git a/mysql-test/suite/sys_vars/r/init_connect_grant.result b/mysql-test/suite/sys_vars/r/init_connect_grant.result index 6c372670..2575052c 100644 --- a/mysql-test/suite/sys_vars/r/init_connect_grant.result +++ b/mysql-test/suite/sys_vars/r/init_connect_grant.result @@ -2,14 +2,14 @@ SET @global=@@global.init_connect; # # MDEV-21961 Bind CONNECTION ADMIN to a number of global system variables # -# Test that "SET init_connect" is not allowed without CONNECTION ADMIN or SUPER +# Test that "SET init_connect" is not allowed without CONNECTION ADMIN CREATE USER user1@localhost; GRANT ALL PRIVILEGES ON *.* TO user1@localhost; -REVOKE CONNECTION ADMIN, SUPER ON *.* FROM user1@localhost; +REVOKE CONNECTION ADMIN ON *.* FROM user1@localhost; connect user1,localhost,user1,,; connection user1; SET GLOBAL init_connect="SET @xxx=1"; -ERROR 42000: Access denied; you need (at least one of) the SUPER, CONNECTION ADMIN privilege(s) for this operation +ERROR 42000: Access denied; you need (at least one of) the CONNECTION ADMIN privilege(s) for this operation SET init_connect="SET @xxx=1"; ERROR HY000: Variable 'init_connect' is a GLOBAL variable and should be set with SET GLOBAL SET SESSION init_connect="SET @xxx=1"; @@ -30,17 +30,4 @@ ERROR HY000: Variable 'init_connect' is a GLOBAL variable and should be set with disconnect user1; connection default; DROP USER user1@localhost; -# Test that "SET init_connect" is allowed with SUPER -CREATE USER user1@localhost; -GRANT SUPER ON *.* TO user1@localhost; -connect user1,localhost,user1,,; -connection user1; -SET GLOBAL init_connect="SET @xxx=1"; -SET init_connect="SET @xxx=1"; -ERROR HY000: Variable 'init_connect' is a GLOBAL variable and should be set with SET GLOBAL -SET SESSION init_connect="SET @xxx=1"; -ERROR HY000: Variable 'init_connect' is a GLOBAL variable and should be set with SET GLOBAL -disconnect user1; -connection default; -DROP USER user1@localhost; SET @@global.init_connect=@global; diff --git a/mysql-test/suite/sys_vars/r/init_slave_grant.result b/mysql-test/suite/sys_vars/r/init_slave_grant.result index 59639b92..9655498d 100644 --- a/mysql-test/suite/sys_vars/r/init_slave_grant.result +++ b/mysql-test/suite/sys_vars/r/init_slave_grant.result @@ -2,14 +2,14 @@ # MDEV-21966 Bind REPLICATION SLAVE ADMIN to a number of global system variables # SET @global=@@global.init_slave; -# Test that "SET init_slave" is not allowed without REPLICATION SLAVE ADMIN or SUPER +# Test that "SET init_slave" is not allowed without REPLICATION SLAVE ADMIN CREATE USER user1@localhost; GRANT ALL PRIVILEGES ON *.* TO user1@localhost; -REVOKE REPLICATION SLAVE ADMIN, SUPER ON *.* FROM user1@localhost; +REVOKE REPLICATION SLAVE ADMIN ON *.* FROM user1@localhost; connect user1,localhost,user1,,; connection user1; SET GLOBAL init_slave='SET @x=1'; -ERROR 42000: Access denied; you need (at least one of) the SUPER, REPLICATION SLAVE ADMIN privilege(s) for this operation +ERROR 42000: Access denied; you need (at least one of) the REPLICATION SLAVE ADMIN privilege(s) for this operation SET init_slave='SET @x=1'; ERROR HY000: Variable 'init_slave' is a GLOBAL variable and should be set with SET GLOBAL SET SESSION init_slave='SET @x=1'; @@ -30,17 +30,4 @@ ERROR HY000: Variable 'init_slave' is a GLOBAL variable and should be set with S disconnect user1; connection default; DROP USER user1@localhost; -# Test that "SET init_slave" is allowed with SUPER -CREATE USER user1@localhost; -GRANT SUPER ON *.* TO user1@localhost; -connect user1,localhost,user1,,; -connection user1; -SET GLOBAL init_slave='SET @x=1'; -SET init_slave='SET @x=1'; -ERROR HY000: Variable 'init_slave' is a GLOBAL variable and should be set with SET GLOBAL -SET SESSION init_slave='SET @x=1'; -ERROR HY000: Variable 'init_slave' is a GLOBAL variable and should be set with SET GLOBAL -disconnect user1; -connection default; -DROP USER user1@localhost; SET @@global.init_slave=@global; diff --git a/mysql-test/suite/sys_vars/r/innodb_change_buffer_max_size_basic.result b/mysql-test/suite/sys_vars/r/innodb_change_buffer_max_size_basic.result deleted file mode 100644 index 03f11ece..00000000 --- a/mysql-test/suite/sys_vars/r/innodb_change_buffer_max_size_basic.result +++ /dev/null @@ -1,77 +0,0 @@ -SET @start_global_value = @@global.innodb_change_buffer_max_size; -SELECT @start_global_value; -@start_global_value -25 -Valid values are between 0 and 50 -select @@global.innodb_change_buffer_max_size between 0 and 50; -@@global.innodb_change_buffer_max_size between 0 and 50 -1 -select @@global.innodb_change_buffer_max_size; -@@global.innodb_change_buffer_max_size -25 -select @@session.innodb_change_buffer_max_size; -ERROR HY000: Variable 'innodb_change_buffer_max_size' is a GLOBAL variable -show global variables like 'innodb_change_buffer_max_size'; -Variable_name Value -innodb_change_buffer_max_size 25 -show session variables like 'innodb_change_buffer_max_size'; -Variable_name Value -innodb_change_buffer_max_size 25 -select * from information_schema.global_variables where variable_name='innodb_change_buffer_max_size'; -VARIABLE_NAME VARIABLE_VALUE -INNODB_CHANGE_BUFFER_MAX_SIZE 25 -select * from information_schema.session_variables where variable_name='innodb_change_buffer_max_size'; -VARIABLE_NAME VARIABLE_VALUE -INNODB_CHANGE_BUFFER_MAX_SIZE 25 -set global innodb_change_buffer_max_size=10; -select @@global.innodb_change_buffer_max_size; -@@global.innodb_change_buffer_max_size -10 -select * from information_schema.global_variables where variable_name='innodb_change_buffer_max_size'; -VARIABLE_NAME VARIABLE_VALUE -INNODB_CHANGE_BUFFER_MAX_SIZE 10 -select * from information_schema.session_variables where variable_name='innodb_change_buffer_max_size'; -VARIABLE_NAME VARIABLE_VALUE -INNODB_CHANGE_BUFFER_MAX_SIZE 10 -set session innodb_change_buffer_max_size=1; -ERROR HY000: Variable 'innodb_change_buffer_max_size' is a GLOBAL variable and should be set with SET GLOBAL -set global innodb_change_buffer_max_size=1.1; -ERROR 42000: Incorrect argument type to variable 'innodb_change_buffer_max_size' -set global innodb_change_buffer_max_size=1e1; -ERROR 42000: Incorrect argument type to variable 'innodb_change_buffer_max_size' -set global innodb_change_buffer_max_size="foo"; -ERROR 42000: Incorrect argument type to variable 'innodb_change_buffer_max_size' -set global innodb_change_buffer_max_size=-7; -Warnings: -Warning 1292 Truncated incorrect innodb_change_buffer_max_size value: '-7' -select @@global.innodb_change_buffer_max_size; -@@global.innodb_change_buffer_max_size -0 -select * from information_schema.global_variables where variable_name='innodb_change_buffer_max_size'; -VARIABLE_NAME VARIABLE_VALUE -INNODB_CHANGE_BUFFER_MAX_SIZE 0 -set global innodb_change_buffer_max_size=56; -Warnings: -Warning 1292 Truncated incorrect innodb_change_buffer_max_size value: '56' -select @@global.innodb_change_buffer_max_size; -@@global.innodb_change_buffer_max_size -50 -select * from information_schema.global_variables where variable_name='innodb_change_buffer_max_size'; -VARIABLE_NAME VARIABLE_VALUE -INNODB_CHANGE_BUFFER_MAX_SIZE 50 -set global innodb_change_buffer_max_size=0; -select @@global.innodb_change_buffer_max_size; -@@global.innodb_change_buffer_max_size -0 -set global innodb_change_buffer_max_size=50; -select @@global.innodb_change_buffer_max_size; -@@global.innodb_change_buffer_max_size -50 -set global innodb_change_buffer_max_size=DEFAULT; -select @@global.innodb_change_buffer_max_size; -@@global.innodb_change_buffer_max_size -25 -SET @@global.innodb_change_buffer_max_size = @start_global_value; -SELECT @@global.innodb_change_buffer_max_size; -@@global.innodb_change_buffer_max_size -25 diff --git a/mysql-test/suite/sys_vars/r/innodb_change_buffering_basic.result b/mysql-test/suite/sys_vars/r/innodb_change_buffering_basic.result deleted file mode 100644 index f3b7ac80..00000000 --- a/mysql-test/suite/sys_vars/r/innodb_change_buffering_basic.result +++ /dev/null @@ -1,73 +0,0 @@ -SET @start_global_value = @@global.innodb_change_buffering; -SELECT @start_global_value; -@start_global_value -none -Valid values are 'all', 'deletes', 'changes', 'inserts', 'none', 'purges' -select @@global.innodb_change_buffering in ('all', 'deletes', 'changes', 'inserts', 'none', 'purges'); -@@global.innodb_change_buffering in ('all', 'deletes', 'changes', 'inserts', 'none', 'purges') -1 -select @@global.innodb_change_buffering; -@@global.innodb_change_buffering -none -select @@session.innodb_change_buffering; -ERROR HY000: Variable 'innodb_change_buffering' is a GLOBAL variable -show global variables like 'innodb_change_buffering'; -Variable_name Value -innodb_change_buffering none -show session variables like 'innodb_change_buffering'; -Variable_name Value -innodb_change_buffering none -select * from information_schema.global_variables where variable_name='innodb_change_buffering'; -VARIABLE_NAME VARIABLE_VALUE -INNODB_CHANGE_BUFFERING none -select * from information_schema.session_variables where variable_name='innodb_change_buffering'; -VARIABLE_NAME VARIABLE_VALUE -INNODB_CHANGE_BUFFERING none -set global innodb_change_buffering='none'; -Warnings: -Warning 1287 '@@innodb_change_buffering' is deprecated and will be removed in a future release -select @@global.innodb_change_buffering; -@@global.innodb_change_buffering -none -select * from information_schema.global_variables where variable_name='innodb_change_buffering'; -VARIABLE_NAME VARIABLE_VALUE -INNODB_CHANGE_BUFFERING none -select * from information_schema.session_variables where variable_name='innodb_change_buffering'; -VARIABLE_NAME VARIABLE_VALUE -INNODB_CHANGE_BUFFERING none -set @@global.innodb_change_buffering='inserts'; -Warnings: -Warning 1287 '@@innodb_change_buffering' is deprecated and will be removed in a future release -select @@global.innodb_change_buffering; -@@global.innodb_change_buffering -inserts -select * from information_schema.global_variables where variable_name='innodb_change_buffering'; -VARIABLE_NAME VARIABLE_VALUE -INNODB_CHANGE_BUFFERING inserts -select * from information_schema.session_variables where variable_name='innodb_change_buffering'; -VARIABLE_NAME VARIABLE_VALUE -INNODB_CHANGE_BUFFERING inserts -set session innodb_change_buffering='some'; -ERROR HY000: Variable 'innodb_change_buffering' is a GLOBAL variable and should be set with SET GLOBAL -set @@session.innodb_change_buffering='some'; -ERROR HY000: Variable 'innodb_change_buffering' is a GLOBAL variable and should be set with SET GLOBAL -set global innodb_change_buffering=1.1; -ERROR 42000: Incorrect argument type to variable 'innodb_change_buffering' -set global innodb_change_buffering=1; -Warnings: -Warning 1287 '@@innodb_change_buffering' is deprecated and will be removed in a future release -SELECT @@global.innodb_change_buffering; -@@global.innodb_change_buffering -inserts -set global innodb_change_buffering=-2; -ERROR 42000: Variable 'innodb_change_buffering' can't be set to the value of '-2' -set global innodb_change_buffering=1e1; -ERROR 42000: Incorrect argument type to variable 'innodb_change_buffering' -set global innodb_change_buffering='some'; -ERROR 42000: Variable 'innodb_change_buffering' can't be set to the value of 'some' -SET @@global.innodb_change_buffering = @start_global_value; -Warnings: -Warning 1287 '@@innodb_change_buffering' is deprecated and will be removed in a future release -SELECT @@global.innodb_change_buffering; -@@global.innodb_change_buffering -none diff --git a/mysql-test/suite/sys_vars/r/innodb_change_buffering_debug_basic.result b/mysql-test/suite/sys_vars/r/innodb_change_buffering_debug_basic.result deleted file mode 100644 index 2cb3fc76..00000000 --- a/mysql-test/suite/sys_vars/r/innodb_change_buffering_debug_basic.result +++ /dev/null @@ -1,67 +0,0 @@ -SET @start_global_value = @@global.innodb_change_buffering_debug; -SELECT @start_global_value; -@start_global_value -0 -select @@global.innodb_change_buffering_debug in (0, 1); -@@global.innodb_change_buffering_debug in (0, 1) -1 -select @@global.innodb_change_buffering_debug; -@@global.innodb_change_buffering_debug -0 -select @@session.innodb_change_buffering_debug; -ERROR HY000: Variable 'innodb_change_buffering_debug' is a GLOBAL variable -show global variables like 'innodb_change_buffering_debug'; -Variable_name Value -innodb_change_buffering_debug 0 -show session variables like 'innodb_change_buffering_debug'; -Variable_name Value -innodb_change_buffering_debug 0 -select * from information_schema.global_variables where variable_name='innodb_change_buffering_debug'; -VARIABLE_NAME VARIABLE_VALUE -INNODB_CHANGE_BUFFERING_DEBUG 0 -select * from information_schema.session_variables where variable_name='innodb_change_buffering_debug'; -VARIABLE_NAME VARIABLE_VALUE -INNODB_CHANGE_BUFFERING_DEBUG 0 -set global innodb_change_buffering_debug=1; -select @@global.innodb_change_buffering_debug; -@@global.innodb_change_buffering_debug -1 -select * from information_schema.global_variables where variable_name='innodb_change_buffering_debug'; -VARIABLE_NAME VARIABLE_VALUE -INNODB_CHANGE_BUFFERING_DEBUG 1 -select * from information_schema.session_variables where variable_name='innodb_change_buffering_debug'; -VARIABLE_NAME VARIABLE_VALUE -INNODB_CHANGE_BUFFERING_DEBUG 1 -set @@global.innodb_change_buffering_debug=0; -select @@global.innodb_change_buffering_debug; -@@global.innodb_change_buffering_debug -0 -select * from information_schema.global_variables where variable_name='innodb_change_buffering_debug'; -VARIABLE_NAME VARIABLE_VALUE -INNODB_CHANGE_BUFFERING_DEBUG 0 -select * from information_schema.session_variables where variable_name='innodb_change_buffering_debug'; -VARIABLE_NAME VARIABLE_VALUE -INNODB_CHANGE_BUFFERING_DEBUG 0 -set session innodb_change_buffering_debug='some'; -ERROR HY000: Variable 'innodb_change_buffering_debug' is a GLOBAL variable and should be set with SET GLOBAL -set @@session.innodb_change_buffering_debug='some'; -ERROR HY000: Variable 'innodb_change_buffering_debug' is a GLOBAL variable and should be set with SET GLOBAL -set global innodb_change_buffering_debug=1.1; -ERROR 42000: Incorrect argument type to variable 'innodb_change_buffering_debug' -set global innodb_change_buffering_debug='foo'; -ERROR 42000: Incorrect argument type to variable 'innodb_change_buffering_debug' -set global innodb_change_buffering_debug=-2; -Warnings: -Warning 1292 Truncated incorrect innodb_change_buffering_debug value: '-2' -set global innodb_change_buffering_debug=1e1; -ERROR 42000: Incorrect argument type to variable 'innodb_change_buffering_debug' -set global innodb_change_buffering_debug=2; -Warnings: -Warning 1292 Truncated incorrect innodb_change_buffering_debug value: '2' -select @@global.innodb_change_buffering_debug; -@@global.innodb_change_buffering_debug -1 -SET @@global.innodb_change_buffering_debug = @start_global_value; -SELECT @@global.innodb_change_buffering_debug; -@@global.innodb_change_buffering_debug -0 diff --git a/mysql-test/suite/sys_vars/r/innodb_defragment_basic.result b/mysql-test/suite/sys_vars/r/innodb_defragment_basic.result deleted file mode 100644 index 916bb5ca..00000000 --- a/mysql-test/suite/sys_vars/r/innodb_defragment_basic.result +++ /dev/null @@ -1,18 +0,0 @@ -SET @orig = @@global.innodb_defragment; -SELECT @orig; -@orig -0 -SET GLOBAL innodb_defragment = OFF; -SELECT @@global.innodb_defragment; -@@global.innodb_defragment -0 -SET GLOBAL innodb_defragment = ON; -SELECT @@global.innodb_defragment; -@@global.innodb_defragment -1 -SET GLOBAL innodb_defragment = 100; -ERROR 42000: Variable 'innodb_defragment' can't be set to the value of '100' -SELECT @@global.innodb_defragment; -@@global.innodb_defragment -1 -SET GLOBAL innodb_defragment = @orig; diff --git a/mysql-test/suite/sys_vars/r/innodb_defragment_fill_factor_basic.result b/mysql-test/suite/sys_vars/r/innodb_defragment_fill_factor_basic.result deleted file mode 100644 index 93a5af72..00000000 --- a/mysql-test/suite/sys_vars/r/innodb_defragment_fill_factor_basic.result +++ /dev/null @@ -1,37 +0,0 @@ -SET @start_innodb_defragment_fill_factor = @@global.innodb_defragment_fill_factor; -SELECT @start_innodb_defragment_fill_factor; -@start_innodb_defragment_fill_factor -0.9 -SELECT COUNT(@@global.innodb_defragment_fill_factor); -COUNT(@@global.innodb_defragment_fill_factor) -1 -SET @@global.innodb_defragment_fill_factor = 0.77777777777777; -SELECT @@global.innodb_defragment_fill_factor; -@@global.innodb_defragment_fill_factor -0.777778 -SET @@global.innodb_defragment_fill_factor = 1; -SELECT @@global.innodb_defragment_fill_factor; -@@global.innodb_defragment_fill_factor -1.000000 -SET @@global.innodb_defragment_fill_factor = 0.7; -SELECT @@global.innodb_defragment_fill_factor; -@@global.innodb_defragment_fill_factor -0.700000 -SET @@global.innodb_defragment_fill_factor = -1; -Warnings: -Warning 1292 Truncated incorrect innodb_defragment_fill_factor value: '-1' -SELECT @@global.innodb_defragment_fill_factor; -@@global.innodb_defragment_fill_factor -0.700000 -SET @@global.innodb_defragment_fill_factor = 2; -Warnings: -Warning 1292 Truncated incorrect innodb_defragment_fill_factor value: '2' -SELECT @@global.innodb_defragment_fill_factor; -@@global.innodb_defragment_fill_factor -1.000000 -SET @@global.innodb_defragment_fill_factor = "abc"; -ERROR 42000: Incorrect argument type to variable 'innodb_defragment_fill_factor' -SELECT @@global.innodb_defragment_fill_factor; -@@global.innodb_defragment_fill_factor -1.000000 -SET @@global.innodb_defragment_fill_factor = @start_innodb_defragment_fill_factor; diff --git a/mysql-test/suite/sys_vars/r/innodb_defragment_fill_factor_n_recs_basic.result b/mysql-test/suite/sys_vars/r/innodb_defragment_fill_factor_n_recs_basic.result deleted file mode 100644 index a8ca081d..00000000 --- a/mysql-test/suite/sys_vars/r/innodb_defragment_fill_factor_n_recs_basic.result +++ /dev/null @@ -1,42 +0,0 @@ -SET @start_innodb_defragment_fill_factor_n_recs = @@global.innodb_defragment_fill_factor_n_recs; -SELECT @start_innodb_defragment_fill_factor_n_recs; -@start_innodb_defragment_fill_factor_n_recs -20 -SELECT COUNT(@@global.innodb_defragment_fill_factor_n_recs); -COUNT(@@global.innodb_defragment_fill_factor_n_recs) -1 -SET @@global.innodb_defragment_fill_factor_n_recs = 50; -SELECT @@global.innodb_defragment_fill_factor_n_recs; -@@global.innodb_defragment_fill_factor_n_recs -50 -SET @@global.innodb_defragment_fill_factor_n_recs = 100; -SELECT @@global.innodb_defragment_fill_factor_n_recs; -@@global.innodb_defragment_fill_factor_n_recs -100 -SET @@global.innodb_defragment_fill_factor_n_recs = 1; -SELECT @@global.innodb_defragment_fill_factor_n_recs; -@@global.innodb_defragment_fill_factor_n_recs -1 -SET @@global.innodb_defragment_fill_factor_n_recs = -1; -Warnings: -Warning 1292 Truncated incorrect innodb_defragment_fill_factor... value: '-1' -SELECT @@global.innodb_defragment_fill_factor_n_recs; -@@global.innodb_defragment_fill_factor_n_recs -1 -SET @@global.innodb_defragment_fill_factor_n_recs = 10000; -Warnings: -Warning 1292 Truncated incorrect innodb_defragment_fill_factor... value: '10000' -SELECT @@global.innodb_defragment_fill_factor_n_recs; -@@global.innodb_defragment_fill_factor_n_recs -100 -SET @@global.innodb_defragment_fill_factor_n_recs = 10.5; -ERROR 42000: Incorrect argument type to variable 'innodb_defragment_fill_factor_n_recs' -SELECT @@global.innodb_defragment_fill_factor_n_recs; -@@global.innodb_defragment_fill_factor_n_recs -100 -SET @@global.innodb_defragment_fill_factor_n_recs = "abc"; -ERROR 42000: Incorrect argument type to variable 'innodb_defragment_fill_factor_n_recs' -SELECT @@global.innodb_defragment_fill_factor_n_recs; -@@global.innodb_defragment_fill_factor_n_recs -100 -SET @@global.innodb_defragment_fill_factor_n_recs = @start_innodb_defragment_fill_factor_n_recs; diff --git a/mysql-test/suite/sys_vars/r/innodb_defragment_frequency_basic.result b/mysql-test/suite/sys_vars/r/innodb_defragment_frequency_basic.result deleted file mode 100644 index d4314d65..00000000 --- a/mysql-test/suite/sys_vars/r/innodb_defragment_frequency_basic.result +++ /dev/null @@ -1,42 +0,0 @@ -SET @start_innodb_defragment_frequency = @@global.innodb_defragment_frequency; -SELECT @start_innodb_defragment_frequency; -@start_innodb_defragment_frequency -40 -SELECT COUNT(@@global.innodb_defragment_frequency); -COUNT(@@global.innodb_defragment_frequency) -1 -SET @@global.innodb_defragment_frequency = 200; -SELECT @@global.innodb_defragment_frequency; -@@global.innodb_defragment_frequency -200 -SET @@global.innodb_defragment_frequency = 1; -SELECT @@global.innodb_defragment_frequency; -@@global.innodb_defragment_frequency -1 -SET @@global.innodb_defragment_frequency = 1000; -SELECT @@global.innodb_defragment_frequency; -@@global.innodb_defragment_frequency -1000 -SET @@global.innodb_defragment_frequency = -1; -Warnings: -Warning 1292 Truncated incorrect innodb_defragment_frequency value: '-1' -SELECT @@global.innodb_defragment_frequency; -@@global.innodb_defragment_frequency -1 -SET @@global.innodb_defragment_frequency = 10000; -Warnings: -Warning 1292 Truncated incorrect innodb_defragment_frequency value: '10000' -SELECT @@global.innodb_defragment_frequency; -@@global.innodb_defragment_frequency -1000 -SET @@global.innodb_defragment_frequency = 10.5; -ERROR 42000: Incorrect argument type to variable 'innodb_defragment_frequency' -SELECT @@global.innodb_defragment_frequency; -@@global.innodb_defragment_frequency -1000 -SET @@global.innodb_defragment_frequency = "abc"; -ERROR 42000: Incorrect argument type to variable 'innodb_defragment_frequency' -SELECT @@global.innodb_defragment_frequency; -@@global.innodb_defragment_frequency -1000 -SET @@global.innodb_defragment_frequency = @start_innodb_defragment_frequency; diff --git a/mysql-test/suite/sys_vars/r/innodb_defragment_n_pages_basic.result b/mysql-test/suite/sys_vars/r/innodb_defragment_n_pages_basic.result deleted file mode 100644 index 99b68b39..00000000 --- a/mysql-test/suite/sys_vars/r/innodb_defragment_n_pages_basic.result +++ /dev/null @@ -1,28 +0,0 @@ -SET @start_innodb_defragment_n_pages = @@global.innodb_defragment_n_pages; -SELECT @start_innodb_defragment_n_pages; -@start_innodb_defragment_n_pages -7 -SELECT COUNT(@@global.innodb_defragment_n_pages); -COUNT(@@global.innodb_defragment_n_pages) -1 -SET @@global.innodb_defragment_n_pages = 1; -Warnings: -Warning 1292 Truncated incorrect innodb_defragment_n_pages value: '1' -SELECT @@global.innodb_defragment_n_pages; -@@global.innodb_defragment_n_pages -2 -SET @@global.innodb_defragment_n_pages = 2; -SELECT @@global.innodb_defragment_n_pages; -@@global.innodb_defragment_n_pages -2 -SET @@global.innodb_defragment_n_pages = 32; -SELECT @@global.innodb_defragment_n_pages; -@@global.innodb_defragment_n_pages -32 -SET @@global.innodb_defragment_n_pages = 64; -Warnings: -Warning 1292 Truncated incorrect innodb_defragment_n_pages value: '64' -SELECT @@global.innodb_defragment_n_pages; -@@global.innodb_defragment_n_pages -32 -SET @@global.innodb_defragment_n_pages = @start_innodb_defragment_n_pages; diff --git a/mysql-test/suite/sys_vars/r/innodb_defragment_stats_accuracy_basic.result b/mysql-test/suite/sys_vars/r/innodb_defragment_stats_accuracy_basic.result deleted file mode 100644 index 025dacdb..00000000 --- a/mysql-test/suite/sys_vars/r/innodb_defragment_stats_accuracy_basic.result +++ /dev/null @@ -1,33 +0,0 @@ -SET @start_innodb_defragment_stats_accuracy = @@global.innodb_defragment_stats_accuracy; -SELECT @start_innodb_defragment_stats_accuracy; -@start_innodb_defragment_stats_accuracy -0 -SELECT COUNT(@@global.innodb_defragment_stats_accuracy); -COUNT(@@global.innodb_defragment_stats_accuracy) -1 -SET @@global.innodb_defragment_stats_accuracy = 1; -SELECT @@global.innodb_defragment_stats_accuracy; -@@global.innodb_defragment_stats_accuracy -1 -SET @@global.innodb_defragment_stats_accuracy = 1000; -SELECT @@global.innodb_defragment_stats_accuracy; -@@global.innodb_defragment_stats_accuracy -1000 -SET @@global.innodb_defragment_stats_accuracy = -1; -Warnings: -Warning 1292 Truncated incorrect innodb_defragment_stats_accuracy value: '-1' -SELECT @@global.innodb_defragment_stats_accuracy; -@@global.innodb_defragment_stats_accuracy -0 -SET @@global.innodb_defragment_stats_accuracy = 1000000000000; -Warnings: -Warning 1292 Truncated incorrect innodb_defragment_stats_accuracy value: '1000000000000' -SELECT @@global.innodb_defragment_stats_accuracy; -@@global.innodb_defragment_stats_accuracy -4294967295 -SET @@global.innodb_defragment_stats_accuracy = "abc"; -ERROR 42000: Incorrect argument type to variable 'innodb_defragment_stats_accuracy' -SELECT @@global.innodb_defragment_stats_accuracy; -@@global.innodb_defragment_stats_accuracy -4294967295 -SET @@global.innodb_defragment_stats_accuracy = @start_innodb_defragment_stats_accuracy; diff --git a/mysql-test/suite/sys_vars/r/innodb_doublewrite_basic.result b/mysql-test/suite/sys_vars/r/innodb_doublewrite_basic.result index 4a5baf0a..9e93d943 100644 --- a/mysql-test/suite/sys_vars/r/innodb_doublewrite_basic.result +++ b/mysql-test/suite/sys_vars/r/innodb_doublewrite_basic.result @@ -1,33 +1,25 @@ -'#---------------------BS_STVARS_026_01----------------------#' -SELECT COUNT(@@GLOBAL.innodb_doublewrite); -COUNT(@@GLOBAL.innodb_doublewrite) -1 -1 Expected -'#---------------------BS_STVARS_026_02----------------------#' +SELECT @@GLOBAL.innodb_doublewrite; +@@GLOBAL.innodb_doublewrite +ON +SET @@GLOBAL.innodb_doublewrite=0; +SELECT @@GLOBAL.innodb_doublewrite; +@@GLOBAL.innodb_doublewrite +OFF +SET @@GLOBAL.innodb_doublewrite=2; +SET @@GLOBAL.innodb_doublewrite=3; +ERROR 42000: Variable 'innodb_doublewrite' can't be set to the value of '3' +SELECT @@GLOBAL.innodb_doublewrite; +@@GLOBAL.innodb_doublewrite +fast SET @@GLOBAL.innodb_doublewrite=1; -ERROR HY000: Variable 'innodb_doublewrite' is a read only variable -Expected error 'Read only variable' -SELECT COUNT(@@GLOBAL.innodb_doublewrite); -COUNT(@@GLOBAL.innodb_doublewrite) -1 -1 Expected -'#---------------------BS_STVARS_026_03----------------------#' -SELECT IF(@@GLOBAL.innodb_doublewrite, "ON", "OFF") = VARIABLE_VALUE -FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES -WHERE VARIABLE_NAME='innodb_doublewrite'; -IF(@@GLOBAL.innodb_doublewrite, "ON", "OFF") = VARIABLE_VALUE -1 -1 Expected -SELECT COUNT(@@GLOBAL.innodb_doublewrite); -COUNT(@@GLOBAL.innodb_doublewrite) -1 -1 Expected +SELECT @@GLOBAL.innodb_doublewrite; +@@GLOBAL.innodb_doublewrite +ON SELECT COUNT(VARIABLE_VALUE) -FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES +FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='innodb_doublewrite'; COUNT(VARIABLE_VALUE) 1 -1 Expected '#---------------------BS_STVARS_026_04----------------------#' SELECT @@innodb_doublewrite = @@GLOBAL.innodb_doublewrite; @@innodb_doublewrite = @@GLOBAL.innodb_doublewrite @@ -48,6 +40,5 @@ SELECT COUNT(@@GLOBAL.innodb_doublewrite); COUNT(@@GLOBAL.innodb_doublewrite) 1 1 Expected -SELECT innodb_doublewrite = @@SESSION.innodb_doublewrite; -ERROR 42S22: Unknown column 'innodb_doublewrite' in 'field list' -Expected error 'Readonly variable' +SELECT @@innodb_doublewrite = @@SESSION.innodb_doublewrite; +ERROR HY000: Variable 'innodb_doublewrite' is a GLOBAL variable diff --git a/mysql-test/suite/sys_vars/r/innodb_fil_make_page_dirty_debug_basic.result b/mysql-test/suite/sys_vars/r/innodb_fil_make_page_dirty_debug_basic.result index db0de5e3..8bea1748 100644 --- a/mysql-test/suite/sys_vars/r/innodb_fil_make_page_dirty_debug_basic.result +++ b/mysql-test/suite/sys_vars/r/innodb_fil_make_page_dirty_debug_basic.result @@ -17,8 +17,6 @@ ERROR HY000: Variable 'innodb_fil_make_page_dirty_debug' is a GLOBAL variable an create table t1 (f1 int primary key) engine = innodb; select space from information_schema.innodb_sys_tables where name = 'test/t1' into @space_id; -Warnings: -Warning 1287 '<select expression> INTO <destination>;' is deprecated and will be removed in a future release. Please use 'SELECT <select list> INTO <destination> FROM...' instead set global innodb_saved_page_number_debug = 0; set global innodb_fil_make_page_dirty_debug = @space_id; drop table t1; diff --git a/mysql-test/suite/sys_vars/r/innodb_file_per_table_basic.result b/mysql-test/suite/sys_vars/r/innodb_file_per_table_basic.result index 9780357e..9d755533 100644 --- a/mysql-test/suite/sys_vars/r/innodb_file_per_table_basic.result +++ b/mysql-test/suite/sys_vars/r/innodb_file_per_table_basic.result @@ -9,18 +9,26 @@ COUNT(@@GLOBAL.innodb_file_per_table) 1 Expected '#---------------------BS_STVARS_028_02----------------------#' SET @@global.innodb_file_per_table = 0; +Warnings: +Warning 1287 '@@innodb_file_per_table' is deprecated and will be removed in a future release SELECT @@global.innodb_file_per_table; @@global.innodb_file_per_table 0 SET @@global.innodb_file_per_table ='On' ; +Warnings: +Warning 1287 '@@innodb_file_per_table' is deprecated and will be removed in a future release SELECT @@global.innodb_file_per_table; @@global.innodb_file_per_table 1 SET @@global.innodb_file_per_table ='Off' ; +Warnings: +Warning 1287 '@@innodb_file_per_table' is deprecated and will be removed in a future release SELECT @@global.innodb_file_per_table; @@global.innodb_file_per_table 0 SET @@global.innodb_file_per_table = 1; +Warnings: +Warning 1287 '@@innodb_file_per_table' is deprecated and will be removed in a future release SELECT @@global.innodb_file_per_table; @@global.innodb_file_per_table 1 @@ -64,6 +72,8 @@ COUNT(@@GLOBAL.innodb_file_per_table) SELECT innodb_file_per_table = @@SESSION.innodb_file_per_table; ERROR 42S22: Unknown column 'innodb_file_per_table' in 'field list' SET @@global.innodb_file_per_table = @start_global_value; +Warnings: +Warning 1287 '@@innodb_file_per_table' is deprecated and will be removed in a future release SELECT @@global.innodb_file_per_table; @@global.innodb_file_per_table 1 diff --git a/mysql-test/suite/sys_vars/r/innodb_ft_result_cache_limit,32bit.rdiff b/mysql-test/suite/sys_vars/r/innodb_ft_result_cache_limit,32bit.rdiff index cd9a004a..79e15420 100644 --- a/mysql-test/suite/sys_vars/r/innodb_ft_result_cache_limit,32bit.rdiff +++ b/mysql-test/suite/sys_vars/r/innodb_ft_result_cache_limit,32bit.rdiff @@ -1,5 +1,5 @@ ---- mysql-test/suite/sys_vars/r/innodb_ft_result_cache_limit.result 2019-05-07 15:09:57.220599318 +0530 -+++ mysql-test/suite/sys_vars/r/innodb_ft_result_cache_limit.reject 2019-05-07 15:10:20.012718538 +0530 +--- mysql-test/suite/sys_vars/r/innodb_ft_result_cache_limit.result ++++ mysql-test/suite/sys_vars/r/innodb_ft_result_cache_limit.reject @@ -1,5 +1,7 @@ set global innodb_ft_result_cache_limit=5000000000; +Warnings: diff --git a/mysql-test/suite/sys_vars/r/innodb_saved_page_number_debug_basic.result b/mysql-test/suite/sys_vars/r/innodb_saved_page_number_debug_basic.result index 2096e65f..1fc959f4 100644 --- a/mysql-test/suite/sys_vars/r/innodb_saved_page_number_debug_basic.result +++ b/mysql-test/suite/sys_vars/r/innodb_saved_page_number_debug_basic.result @@ -17,8 +17,6 @@ ERROR HY000: Variable 'innodb_saved_page_number_debug' is a GLOBAL variable and create table t1 (f1 int primary key) engine = innodb; select space from information_schema.innodb_sys_tables where name = 'test/t1' into @space_id; -Warnings: -Warning 1287 '<select expression> INTO <destination>;' is deprecated and will be removed in a future release. Please use 'SELECT <select list> INTO <destination> FROM...' instead set global innodb_saved_page_number_debug = 0; set global innodb_fil_make_page_dirty_debug = @space_id; drop table t1; diff --git a/mysql-test/suite/sys_vars/r/lc_time_names_basic.result b/mysql-test/suite/sys_vars/r/lc_time_names_basic.result index c1896a0c..2cd5fa81 100644 --- a/mysql-test/suite/sys_vars/r/lc_time_names_basic.result +++ b/mysql-test/suite/sys_vars/r/lc_time_names_basic.result @@ -456,12 +456,6 @@ SET @@session.lc_time_names=sq_AL; SELECT @@session.lc_time_names; @@session.lc_time_names sq_AL -SET @@session.lc_time_names=sr_YU; -Warnings: -Warning 1287 'sr_YU' is deprecated and will be removed in a future release. Please use sr_RS instead -SELECT @@session.lc_time_names; -@@session.lc_time_names -sr_RS SET @@session.lc_time_names=sv_FI; SELECT @@session.lc_time_names; @@session.lc_time_names @@ -903,12 +897,6 @@ SET @@global.lc_time_names=sq_AL; SELECT @@global.lc_time_names; @@global.lc_time_names sq_AL -SET @@global.lc_time_names=sr_YU; -Warnings: -Warning 1287 'sr_YU' is deprecated and will be removed in a future release. Please use sr_RS instead -SELECT @@global.lc_time_names; -@@global.lc_time_names -sr_RS SET @@global.lc_time_names=sv_FI; SELECT @@global.lc_time_names; @@global.lc_time_names @@ -1028,7 +1016,11 @@ SELECT @@lc_time_names; @@lc_time_names ka_GE SET @@lc_time_names = 112; -ERROR HY000: Unknown locale: '112' +SELECT @@lc_time_names; +@@lc_time_names +sw_KE +SET @@lc_time_names = 113; +ERROR HY000: Unknown locale: '113' '#--------------------FN_DYNVARS_060_10-------------------------#' SET @@lc_time_names = en_EN; ERROR HY000: Unknown locale: 'en_EN' @@ -1042,6 +1034,8 @@ SET @@lc_time_names = 'en US'; ERROR HY000: Unknown locale: 'en US' SET @@lc_time_names = 'enUS'; ERROR HY000: Unknown locale: 'enUS' +SET @@session.lc_time_names=sr_YU; +ERROR HY000: Unknown locale: 'sr_YU' SET @@lc_time_names = true; SELECT @@lc_time_names AS res_with_true; res_with_true diff --git a/mysql-test/suite/sys_vars/r/log_bin_compress_grant.result b/mysql-test/suite/sys_vars/r/log_bin_compress_grant.result index f75f22a7..1f0220a8 100644 --- a/mysql-test/suite/sys_vars/r/log_bin_compress_grant.result +++ b/mysql-test/suite/sys_vars/r/log_bin_compress_grant.result @@ -2,14 +2,14 @@ # MDEV-21963 Bind BINLOG ADMIN to a number of global system variables # SET @global=@@global.log_bin_compress; -# Test that "SET log_bin_compress" is not allowed without BINLOG ADMIN or SUPER +# Test that "SET log_bin_compress" is not allowed without BINLOG ADMIN CREATE USER user1@localhost; GRANT ALL PRIVILEGES ON *.* TO user1@localhost; -REVOKE BINLOG ADMIN, SUPER ON *.* FROM user1@localhost; +REVOKE BINLOG ADMIN ON *.* FROM user1@localhost; connect user1,localhost,user1,,; connection user1; SET GLOBAL log_bin_compress=1; -ERROR 42000: Access denied; you need (at least one of) the SUPER, BINLOG ADMIN privilege(s) for this operation +ERROR 42000: Access denied; you need (at least one of) the BINLOG ADMIN privilege(s) for this operation SET log_bin_compress=1; ERROR HY000: Variable 'log_bin_compress' is a GLOBAL variable and should be set with SET GLOBAL SET SESSION log_bin_compress=1; @@ -30,17 +30,4 @@ ERROR HY000: Variable 'log_bin_compress' is a GLOBAL variable and should be set disconnect user1; connection default; DROP USER user1@localhost; -# Test that "SET log_bin_compress" is allowed with SUPER -CREATE USER user1@localhost; -GRANT SUPER ON *.* TO user1@localhost; -connect user1,localhost,user1,,; -connection user1; -SET GLOBAL log_bin_compress=1; -SET log_bin_compress=1; -ERROR HY000: Variable 'log_bin_compress' is a GLOBAL variable and should be set with SET GLOBAL -SET SESSION log_bin_compress=1; -ERROR HY000: Variable 'log_bin_compress' is a GLOBAL variable and should be set with SET GLOBAL -disconnect user1; -connection default; -DROP USER user1@localhost; SET @@global.log_bin_compress=@global; diff --git a/mysql-test/suite/sys_vars/r/log_bin_compress_min_len_grant.result b/mysql-test/suite/sys_vars/r/log_bin_compress_min_len_grant.result index b1ccafb1..2f4590b4 100644 --- a/mysql-test/suite/sys_vars/r/log_bin_compress_min_len_grant.result +++ b/mysql-test/suite/sys_vars/r/log_bin_compress_min_len_grant.result @@ -2,14 +2,14 @@ # MDEV-21963 Bind BINLOG ADMIN to a number of global system variables # SET @global=@@global.log_bin_compress_min_len; -# Test that "SET log_bin_compress_min_len" is not allowed without BINLOG ADMIN or SUPER +# Test that "SET log_bin_compress_min_len" is not allowed without BINLOG ADMIN CREATE USER user1@localhost; GRANT ALL PRIVILEGES ON *.* TO user1@localhost; -REVOKE BINLOG ADMIN, SUPER ON *.* FROM user1@localhost; +REVOKE BINLOG ADMIN ON *.* FROM user1@localhost; connect user1,localhost,user1,,; connection user1; SET GLOBAL log_bin_compress_min_len=512; -ERROR 42000: Access denied; you need (at least one of) the SUPER, BINLOG ADMIN privilege(s) for this operation +ERROR 42000: Access denied; you need (at least one of) the BINLOG ADMIN privilege(s) for this operation SET log_bin_compress_min_len=512; ERROR HY000: Variable 'log_bin_compress_min_len' is a GLOBAL variable and should be set with SET GLOBAL SET SESSION log_bin_compress_min_len=512; @@ -30,17 +30,4 @@ ERROR HY000: Variable 'log_bin_compress_min_len' is a GLOBAL variable and should disconnect user1; connection default; DROP USER user1@localhost; -# Test that "SET log_bin_compress_min_len" is allowed with SUPER -CREATE USER user1@localhost; -GRANT SUPER ON *.* TO user1@localhost; -connect user1,localhost,user1,,; -connection user1; -SET GLOBAL log_bin_compress_min_len=512; -SET log_bin_compress_min_len=512; -ERROR HY000: Variable 'log_bin_compress_min_len' is a GLOBAL variable and should be set with SET GLOBAL -SET SESSION log_bin_compress_min_len=512; -ERROR HY000: Variable 'log_bin_compress_min_len' is a GLOBAL variable and should be set with SET GLOBAL -disconnect user1; -connection default; -DROP USER user1@localhost; SET @@global.log_bin_compress_min_len=@global; diff --git a/mysql-test/suite/sys_vars/r/log_bin_trust_function_creators_grant.result b/mysql-test/suite/sys_vars/r/log_bin_trust_function_creators_grant.result index ef9af94d..5d3948bf 100644 --- a/mysql-test/suite/sys_vars/r/log_bin_trust_function_creators_grant.result +++ b/mysql-test/suite/sys_vars/r/log_bin_trust_function_creators_grant.result @@ -2,14 +2,14 @@ # MDEV-21963 Bind BINLOG ADMIN to a number of global system variables # SET @global=@@global.log_bin_trust_function_creators; -# Test that "SET log_bin_trust_function_creators" is not allowed without BINLOG ADMIN or SUPER +# Test that "SET log_bin_trust_function_creators" is not allowed without BINLOG ADMIN CREATE USER user1@localhost; GRANT ALL PRIVILEGES ON *.* TO user1@localhost; -REVOKE BINLOG ADMIN, SUPER ON *.* FROM user1@localhost; +REVOKE BINLOG ADMIN ON *.* FROM user1@localhost; connect user1,localhost,user1,,; connection user1; SET GLOBAL log_bin_trust_function_creators=1; -ERROR 42000: Access denied; you need (at least one of) the SUPER, BINLOG ADMIN privilege(s) for this operation +ERROR 42000: Access denied; you need (at least one of) the BINLOG ADMIN privilege(s) for this operation SET log_bin_trust_function_creators=1; ERROR HY000: Variable 'log_bin_trust_function_creators' is a GLOBAL variable and should be set with SET GLOBAL SET SESSION log_bin_trust_function_creators=1; @@ -30,17 +30,4 @@ ERROR HY000: Variable 'log_bin_trust_function_creators' is a GLOBAL variable and disconnect user1; connection default; DROP USER user1@localhost; -# Test that "SET log_bin_trust_function_creators" is allowed with SUPER -CREATE USER user1@localhost; -GRANT SUPER ON *.* TO user1@localhost; -connect user1,localhost,user1,,; -connection user1; -SET GLOBAL log_bin_trust_function_creators=1; -SET log_bin_trust_function_creators=1; -ERROR HY000: Variable 'log_bin_trust_function_creators' is a GLOBAL variable and should be set with SET GLOBAL -SET SESSION log_bin_trust_function_creators=1; -ERROR HY000: Variable 'log_bin_trust_function_creators' is a GLOBAL variable and should be set with SET GLOBAL -disconnect user1; -connection default; -DROP USER user1@localhost; SET @@global.log_bin_trust_function_creators=@global; diff --git a/mysql-test/suite/sys_vars/r/log_slow_admin_statements_func.result b/mysql-test/suite/sys_vars/r/log_slow_admin_statements_func.result index 95916d8c..41a15e43 100644 --- a/mysql-test/suite/sys_vars/r/log_slow_admin_statements_func.result +++ b/mysql-test/suite/sys_vars/r/log_slow_admin_statements_func.result @@ -11,6 +11,8 @@ SET GLOBAL log_output = 'file,table'; SET GLOBAL slow_query_log = on; SET SESSION long_query_time = 0; SET SESSION log_slow_admin_statements = on; +Warnings: +Warning 1287 '@@log_slow_admin_statements' is deprecated and will be removed in a future release. Please use '@@log_slow_filter' instead ALTER TABLE log_slow_admin_statements ADD COLUMN k INT DEFAULT 17; CREATE PROCEDURE add_rows() BEGIN @@ -42,22 +44,32 @@ SET @@global.log_output= @old_log_output; SET @@global.slow_query_log= @old_slow_query_log; SET @@session.long_query_time= @old_long_query_time; SET @@global.log_slow_admin_statements= @old_log_slow_admin_statements; +Warnings: +Warning 1287 '@@log_slow_admin_statements' is deprecated and will be removed in a future release. Please use '@@log_slow_filter' instead DROP PROCEDURE add_rows; TRUNCATE TABLE mysql.slow_log; SET @save_log_slow_disabled_statements= @@global.log_slow_disabled_statements; SET @@SESSION.log_slow_admin_statements= TRUE; +Warnings: +Warning 1287 '@@log_slow_admin_statements' is deprecated and will be removed in a future release. Please use '@@log_slow_filter' instead select @@SESSION.log_slow_disabled_statements; @@SESSION.log_slow_disabled_statements sp SET @@SESSION.log_slow_admin_statements= FALSE; +Warnings: +Warning 1287 '@@log_slow_admin_statements' is deprecated and will be removed in a future release. Please use '@@log_slow_filter' instead select @@SESSION.log_slow_disabled_statements; @@SESSION.log_slow_disabled_statements admin,sp SET @@GLOBAL.log_slow_admin_statements= TRUE; +Warnings: +Warning 1287 '@@log_slow_admin_statements' is deprecated and will be removed in a future release. Please use '@@log_slow_filter' instead select @@GLOBAL.log_slow_disabled_statements; @@GLOBAL.log_slow_disabled_statements sp SET @@GLOBAL.log_slow_admin_statements= FALSE; +Warnings: +Warning 1287 '@@log_slow_admin_statements' is deprecated and will be removed in a future release. Please use '@@log_slow_filter' instead select @@GLOBAL.log_slow_disabled_statements; @@GLOBAL.log_slow_disabled_statements admin,sp diff --git a/mysql-test/suite/sys_vars/r/master_verify_checksum_grant.result b/mysql-test/suite/sys_vars/r/master_verify_checksum_grant.result index 4791e4cd..8d773f35 100644 --- a/mysql-test/suite/sys_vars/r/master_verify_checksum_grant.result +++ b/mysql-test/suite/sys_vars/r/master_verify_checksum_grant.result @@ -2,14 +2,14 @@ # MDEV-21972 Bind REPLICATION MASTER ADMIN to master_verify_checksum # SET @global=@@global.master_verify_checksum; -# Test that "SET master_verify_checksum" is not allowed without REPLICATION MASTER ADMIN or SUPER +# Test that "SET master_verify_checksum" is not allowed without REPLICATION MASTER ADMIN CREATE USER user1@localhost; GRANT ALL PRIVILEGES ON *.* TO user1@localhost; -REVOKE REPLICATION MASTER ADMIN, SUPER ON *.* FROM user1@localhost; +REVOKE REPLICATION MASTER ADMIN ON *.* FROM user1@localhost; connect user1,localhost,user1,,; connection user1; SET GLOBAL master_verify_checksum=1; -ERROR 42000: Access denied; you need (at least one of) the SUPER, REPLICATION MASTER ADMIN privilege(s) for this operation +ERROR 42000: Access denied; you need (at least one of) the REPLICATION MASTER ADMIN privilege(s) for this operation SET master_verify_checksum=1; ERROR HY000: Variable 'master_verify_checksum' is a GLOBAL variable and should be set with SET GLOBAL SET SESSION master_verify_checksum=1; @@ -30,17 +30,4 @@ ERROR HY000: Variable 'master_verify_checksum' is a GLOBAL variable and should b disconnect user1; connection default; DROP USER user1@localhost; -# Test that "SET master_verify_checksum" is allowed with SUPER -CREATE USER user1@localhost; -GRANT SUPER ON *.* TO user1@localhost; -connect user1,localhost,user1,,; -connection user1; -SET GLOBAL master_verify_checksum=1; -SET master_verify_checksum=1; -ERROR HY000: Variable 'master_verify_checksum' is a GLOBAL variable and should be set with SET GLOBAL -SET SESSION master_verify_checksum=1; -ERROR HY000: Variable 'master_verify_checksum' is a GLOBAL variable and should be set with SET GLOBAL -disconnect user1; -connection default; -DROP USER user1@localhost; SET @@global.master_verify_checksum=@global; diff --git a/mysql-test/suite/sys_vars/r/max_binlog_cache_size_grant.result b/mysql-test/suite/sys_vars/r/max_binlog_cache_size_grant.result index 350194c4..f1108553 100644 --- a/mysql-test/suite/sys_vars/r/max_binlog_cache_size_grant.result +++ b/mysql-test/suite/sys_vars/r/max_binlog_cache_size_grant.result @@ -2,14 +2,14 @@ # MDEV-21963 Bind BINLOG ADMIN to a number of global system variables # SET @global=@@global.max_binlog_cache_size; -# Test that "SET max_binlog_cache_size" is not allowed without BINLOG ADMIN or SUPER +# Test that "SET max_binlog_cache_size" is not allowed without BINLOG ADMIN CREATE USER user1@localhost; GRANT ALL PRIVILEGES ON *.* TO user1@localhost; -REVOKE BINLOG ADMIN, SUPER ON *.* FROM user1@localhost; +REVOKE BINLOG ADMIN ON *.* FROM user1@localhost; connect user1,localhost,user1,,; connection user1; SET GLOBAL max_binlog_cache_size=4096; -ERROR 42000: Access denied; you need (at least one of) the SUPER, BINLOG ADMIN privilege(s) for this operation +ERROR 42000: Access denied; you need (at least one of) the BINLOG ADMIN privilege(s) for this operation SET max_binlog_cache_size=4096; ERROR HY000: Variable 'max_binlog_cache_size' is a GLOBAL variable and should be set with SET GLOBAL SET SESSION max_binlog_cache_size=4096; @@ -30,17 +30,4 @@ ERROR HY000: Variable 'max_binlog_cache_size' is a GLOBAL variable and should be disconnect user1; connection default; DROP USER user1@localhost; -# Test that "SET max_binlog_cache_size" is allowed with SUPER -CREATE USER user1@localhost; -GRANT SUPER ON *.* TO user1@localhost; -connect user1,localhost,user1,,; -connection user1; -SET GLOBAL max_binlog_cache_size=4096; -SET max_binlog_cache_size=4096; -ERROR HY000: Variable 'max_binlog_cache_size' is a GLOBAL variable and should be set with SET GLOBAL -SET SESSION max_binlog_cache_size=4096; -ERROR HY000: Variable 'max_binlog_cache_size' is a GLOBAL variable and should be set with SET GLOBAL -disconnect user1; -connection default; -DROP USER user1@localhost; SET @@global.max_binlog_cache_size=@global; diff --git a/mysql-test/suite/sys_vars/r/max_binlog_size_grant.result b/mysql-test/suite/sys_vars/r/max_binlog_size_grant.result index 34e1fde7..6937e82d 100644 --- a/mysql-test/suite/sys_vars/r/max_binlog_size_grant.result +++ b/mysql-test/suite/sys_vars/r/max_binlog_size_grant.result @@ -2,14 +2,14 @@ # MDEV-21963 Bind BINLOG ADMIN to a number of global system variables # SET @global=@@global.max_binlog_size; -# Test that "SET max_binlog_size" is not allowed without BINLOG ADMIN or SUPER +# Test that "SET max_binlog_size" is not allowed without BINLOG ADMIN CREATE USER user1@localhost; GRANT ALL PRIVILEGES ON *.* TO user1@localhost; -REVOKE BINLOG ADMIN, SUPER ON *.* FROM user1@localhost; +REVOKE BINLOG ADMIN ON *.* FROM user1@localhost; connect user1,localhost,user1,,; connection user1; SET GLOBAL max_binlog_size=4096; -ERROR 42000: Access denied; you need (at least one of) the SUPER, BINLOG ADMIN privilege(s) for this operation +ERROR 42000: Access denied; you need (at least one of) the BINLOG ADMIN privilege(s) for this operation SET max_binlog_size=4096; ERROR HY000: Variable 'max_binlog_size' is a GLOBAL variable and should be set with SET GLOBAL SET SESSION max_binlog_size=4096; @@ -30,17 +30,4 @@ ERROR HY000: Variable 'max_binlog_size' is a GLOBAL variable and should be set w disconnect user1; connection default; DROP USER user1@localhost; -# Test that "SET max_binlog_size" is allowed with SUPER -CREATE USER user1@localhost; -GRANT SUPER ON *.* TO user1@localhost; -connect user1,localhost,user1,,; -connection user1; -SET GLOBAL max_binlog_size=4096; -SET max_binlog_size=4096; -ERROR HY000: Variable 'max_binlog_size' is a GLOBAL variable and should be set with SET GLOBAL -SET SESSION max_binlog_size=4096; -ERROR HY000: Variable 'max_binlog_size' is a GLOBAL variable and should be set with SET GLOBAL -disconnect user1; -connection default; -DROP USER user1@localhost; SET @@global.max_binlog_size=@global; diff --git a/mysql-test/suite/sys_vars/r/max_binlog_stmt_cache_size_grant.result b/mysql-test/suite/sys_vars/r/max_binlog_stmt_cache_size_grant.result index 2ddd164f..c6a01661 100644 --- a/mysql-test/suite/sys_vars/r/max_binlog_stmt_cache_size_grant.result +++ b/mysql-test/suite/sys_vars/r/max_binlog_stmt_cache_size_grant.result @@ -2,14 +2,14 @@ # MDEV-21963 Bind BINLOG ADMIN to a number of global system variables # SET @global=@@global.max_binlog_stmt_cache_size; -# Test that "SET max_binlog_stmt_cache_size" is not allowed without BINLOG ADMIN or SUPER +# Test that "SET max_binlog_stmt_cache_size" is not allowed without BINLOG ADMIN CREATE USER user1@localhost; GRANT ALL PRIVILEGES ON *.* TO user1@localhost; -REVOKE BINLOG ADMIN, SUPER ON *.* FROM user1@localhost; +REVOKE BINLOG ADMIN ON *.* FROM user1@localhost; connect user1,localhost,user1,,; connection user1; SET GLOBAL max_binlog_stmt_cache_size=4096; -ERROR 42000: Access denied; you need (at least one of) the SUPER, BINLOG ADMIN privilege(s) for this operation +ERROR 42000: Access denied; you need (at least one of) the BINLOG ADMIN privilege(s) for this operation SET max_binlog_stmt_cache_size=4096; ERROR HY000: Variable 'max_binlog_stmt_cache_size' is a GLOBAL variable and should be set with SET GLOBAL SET SESSION max_binlog_stmt_cache_size=4096; @@ -30,17 +30,4 @@ ERROR HY000: Variable 'max_binlog_stmt_cache_size' is a GLOBAL variable and shou disconnect user1; connection default; DROP USER user1@localhost; -# Test that "SET max_binlog_stmt_cache_size" is allowed with SUPER -CREATE USER user1@localhost; -GRANT SUPER ON *.* TO user1@localhost; -connect user1,localhost,user1,,; -connection user1; -SET GLOBAL max_binlog_stmt_cache_size=4096; -SET max_binlog_stmt_cache_size=4096; -ERROR HY000: Variable 'max_binlog_stmt_cache_size' is a GLOBAL variable and should be set with SET GLOBAL -SET SESSION max_binlog_stmt_cache_size=4096; -ERROR HY000: Variable 'max_binlog_stmt_cache_size' is a GLOBAL variable and should be set with SET GLOBAL -disconnect user1; -connection default; -DROP USER user1@localhost; SET @@global.max_binlog_stmt_cache_size=@global; diff --git a/mysql-test/suite/sys_vars/r/max_binlog_total_size_basic.result b/mysql-test/suite/sys_vars/r/max_binlog_total_size_basic.result new file mode 100644 index 00000000..898d3bcd --- /dev/null +++ b/mysql-test/suite/sys_vars/r/max_binlog_total_size_basic.result @@ -0,0 +1,41 @@ +select @@global.max_binlog_total_size; +@@global.max_binlog_total_size +0 +select @@session.max_binlog_total_size; +ERROR HY000: Variable 'max_binlog_total_size' is a GLOBAL variable +show global variables like 'max_binlog_total_size'; +Variable_name Value +max_binlog_total_size 0 +show session variables like 'max_binlog_total_size'; +Variable_name Value +max_binlog_total_size 0 +select * from information_schema.global_variables where variable_name='max_binlog_total_size'; +VARIABLE_NAME VARIABLE_VALUE +MAX_BINLOG_TOTAL_SIZE 0 +select * from information_schema.session_variables where variable_name='max_binlog_total_size'; +VARIABLE_NAME VARIABLE_VALUE +MAX_BINLOG_TOTAL_SIZE 0 +set global max_binlog_total_size=1; +select @@global.max_binlog_total_size, @@global.binlog_space_limit; +@@global.max_binlog_total_size @@global.binlog_space_limit +1 1 +set global max_binlog_total_size=1; +select @@global.max_binlog_total_size; +@@global.max_binlog_total_size +1 +set global binlog_space_limit=2; +select @@global.max_binlog_total_size, @@global.binlog_space_limit; +@@global.max_binlog_total_size @@global.binlog_space_limit +2 2 +set session max_binlog_total_size=1; +ERROR HY000: Variable 'max_binlog_total_size' is a GLOBAL variable and should be set with SET GLOBAL +set global max_binlog_total_size=default; +CREATE USER user1@localhost; +connect con2,localhost,user1,,; +set global max_binlog_total_size=1; +ERROR 42000: Access denied; you need (at least one of) the BINLOG ADMIN privilege(s) for this operation +set global binlog_space_limit=1; +ERROR 42000: Access denied; you need (at least one of) the BINLOG ADMIN privilege(s) for this operation +disconnect con2; +connection default; +DROP USER user1@localhost; diff --git a/mysql-test/suite/sys_vars/r/max_connect_errors_grant.result b/mysql-test/suite/sys_vars/r/max_connect_errors_grant.result index 527a4eca..be145cb6 100644 --- a/mysql-test/suite/sys_vars/r/max_connect_errors_grant.result +++ b/mysql-test/suite/sys_vars/r/max_connect_errors_grant.result @@ -2,14 +2,14 @@ SET @global=@@global.max_connect_errors; # # MDEV-21961 Bind CONNECTION ADMIN to a number of global system variables # -# Test that "SET max_connect_errors" is not allowed without CONNECTION ADMIN or SUPER +# Test that "SET max_connect_errors" is not allowed without CONNECTION ADMIN CREATE USER user1@localhost; GRANT ALL PRIVILEGES ON *.* TO user1@localhost; -REVOKE CONNECTION ADMIN, SUPER ON *.* FROM user1@localhost; +REVOKE CONNECTION ADMIN ON *.* FROM user1@localhost; connect user1,localhost,user1,,; connection user1; SET GLOBAL max_connect_errors=10; -ERROR 42000: Access denied; you need (at least one of) the SUPER, CONNECTION ADMIN privilege(s) for this operation +ERROR 42000: Access denied; you need (at least one of) the CONNECTION ADMIN privilege(s) for this operation SET max_connect_errors=10; ERROR HY000: Variable 'max_connect_errors' is a GLOBAL variable and should be set with SET GLOBAL SET SESSION max_connect_errors=10; @@ -30,17 +30,4 @@ ERROR HY000: Variable 'max_connect_errors' is a GLOBAL variable and should be se disconnect user1; connection default; DROP USER user1@localhost; -# Test that "SET max_connect_errors" is allowed with SUPER -CREATE USER user1@localhost; -GRANT SUPER ON *.* TO user1@localhost; -connect user1,localhost,user1,,; -connection user1; -SET GLOBAL max_connect_errors=10; -SET max_connect_errors=10; -ERROR HY000: Variable 'max_connect_errors' is a GLOBAL variable and should be set with SET GLOBAL -SET SESSION max_connect_errors=10; -ERROR HY000: Variable 'max_connect_errors' is a GLOBAL variable and should be set with SET GLOBAL -disconnect user1; -connection default; -DROP USER user1@localhost; SET @@global.max_connect_errors=@global; diff --git a/mysql-test/suite/sys_vars/r/max_connections_grant.result b/mysql-test/suite/sys_vars/r/max_connections_grant.result index e55904d4..7cd67847 100644 --- a/mysql-test/suite/sys_vars/r/max_connections_grant.result +++ b/mysql-test/suite/sys_vars/r/max_connections_grant.result @@ -2,14 +2,14 @@ SET @global=@@global.max_connections; # # MDEV-21961 Bind CONNECTION ADMIN to a number of global system variables # -# Test that "SET max_connections" is not allowed without CONNECTION ADMIN or SUPER +# Test that "SET max_connections" is not allowed without CONNECTION ADMIN CREATE USER user1@localhost; GRANT ALL PRIVILEGES ON *.* TO user1@localhost; -REVOKE CONNECTION ADMIN, SUPER ON *.* FROM user1@localhost; +REVOKE CONNECTION ADMIN ON *.* FROM user1@localhost; connect user1,localhost,user1,,; connection user1; SET GLOBAL max_connections=10; -ERROR 42000: Access denied; you need (at least one of) the SUPER, CONNECTION ADMIN privilege(s) for this operation +ERROR 42000: Access denied; you need (at least one of) the CONNECTION ADMIN privilege(s) for this operation SET max_connections=10; ERROR HY000: Variable 'max_connections' is a GLOBAL variable and should be set with SET GLOBAL SET SESSION max_connections=10; @@ -30,17 +30,4 @@ ERROR HY000: Variable 'max_connections' is a GLOBAL variable and should be set w disconnect user1; connection default; DROP USER user1@localhost; -# Test that "SET max_connections" is allowed with SUPER -CREATE USER user1@localhost; -GRANT SUPER ON *.* TO user1@localhost; -connect user1,localhost,user1,,; -connection user1; -SET GLOBAL max_connections=10; -SET max_connections=10; -ERROR HY000: Variable 'max_connections' is a GLOBAL variable and should be set with SET GLOBAL -SET SESSION max_connections=10; -ERROR HY000: Variable 'max_connections' is a GLOBAL variable and should be set with SET GLOBAL -disconnect user1; -connection default; -DROP USER user1@localhost; SET @@global.max_connections=@global; diff --git a/mysql-test/suite/sys_vars/r/max_join_size_basic.result b/mysql-test/suite/sys_vars/r/max_join_size_basic.result index b87de2bc..784d0d0f 100644 --- a/mysql-test/suite/sys_vars/r/max_join_size_basic.result +++ b/mysql-test/suite/sys_vars/r/max_join_size_basic.result @@ -21,25 +21,25 @@ select * from information_schema.session_variables where variable_name='max_join VARIABLE_NAME VARIABLE_VALUE MAX_JOIN_SIZE 18446744073709551615 set global max_join_size=10; -set session max_join_size=20; +set session max_join_size=100; select @@global.max_join_size; @@global.max_join_size 10 select @@session.max_join_size; @@session.max_join_size -20 +100 show global variables like 'max_join_size'; Variable_name Value max_join_size 10 show session variables like 'max_join_size'; Variable_name Value -max_join_size 20 +max_join_size 100 select * from information_schema.global_variables where variable_name='max_join_size'; VARIABLE_NAME VARIABLE_VALUE MAX_JOIN_SIZE 10 select * from information_schema.session_variables where variable_name='max_join_size'; VARIABLE_NAME VARIABLE_VALUE -MAX_JOIN_SIZE 20 +MAX_JOIN_SIZE 100 set global max_join_size=1.1; ERROR 42000: Incorrect argument type to variable 'max_join_size' set global max_join_size=1e1; diff --git a/mysql-test/suite/sys_vars/r/max_join_size_func.result b/mysql-test/suite/sys_vars/r/max_join_size_func.result index cacc918e..d46b89d1 100644 --- a/mysql-test/suite/sys_vars/r/max_join_size_func.result +++ b/mysql-test/suite/sys_vars/r/max_join_size_func.result @@ -39,19 +39,19 @@ id name id name connect test_con1, localhost, root,,; connection test_con1; ## Setting value of max_join_size ## -SET @@session.max_join_size=8; +SET @@session.max_join_size=4; ## Since total joins are more than max_join_size value so error will occur ## SELECT * FROM t1 INNER JOIN t2 ON t1.id = t2.id; ERROR 42000: The SELECT would examine more than MAX_JOIN_SIZE rows; check your WHERE and use SET SQL_BIG_SELECTS=1 or SET MAX_JOIN_SIZE=# if the SELECT is okay '#--------------------FN_DYNVARS_079_03-------------------------#' ## Setting global value of variable ## -SET @@global.max_join_size=8; +SET @@global.max_join_size=4; connect test_con2, localhost, root,,; connection test_con2; ## Verifying value of max_join_size ## SELECT @@global.max_join_size; @@global.max_join_size -8 +4 ## Since total joins are more than max_join_size value so error will occur ## SELECT * FROM t1 INNER JOIN t2 ON t1.id = t2.id; ERROR 42000: The SELECT would examine more than MAX_JOIN_SIZE rows; check your WHERE and use SET SQL_BIG_SELECTS=1 or SET MAX_JOIN_SIZE=# if the SELECT is okay diff --git a/mysql-test/suite/sys_vars/r/max_password_errors_grant.result b/mysql-test/suite/sys_vars/r/max_password_errors_grant.result index 4ae0dfb8..58817d3c 100644 --- a/mysql-test/suite/sys_vars/r/max_password_errors_grant.result +++ b/mysql-test/suite/sys_vars/r/max_password_errors_grant.result @@ -2,14 +2,14 @@ SET @global=@@global.max_password_errors; # # MDEV-21961 Bind CONNECTION ADMIN to a number of global system variables # -# Test that "SET max_password_errors" is not allowed without CONNECTION ADMIN or SUPER +# Test that "SET max_password_errors" is not allowed without CONNECTION ADMIN CREATE USER user1@localhost; GRANT ALL PRIVILEGES ON *.* TO user1@localhost; -REVOKE CONNECTION ADMIN, SUPER ON *.* FROM user1@localhost; +REVOKE CONNECTION ADMIN ON *.* FROM user1@localhost; connect user1,localhost,user1,,; connection user1; SET GLOBAL max_password_errors=10; -ERROR 42000: Access denied; you need (at least one of) the SUPER, CONNECTION ADMIN privilege(s) for this operation +ERROR 42000: Access denied; you need (at least one of) the CONNECTION ADMIN privilege(s) for this operation SET max_password_errors=10; ERROR HY000: Variable 'max_password_errors' is a GLOBAL variable and should be set with SET GLOBAL SET SESSION max_password_errors=10; @@ -30,17 +30,4 @@ ERROR HY000: Variable 'max_password_errors' is a GLOBAL variable and should be s disconnect user1; connection default; DROP USER user1@localhost; -# Test that "SET max_password_errors" is allowed with SUPER -CREATE USER user1@localhost; -GRANT SUPER ON *.* TO user1@localhost; -connect user1,localhost,user1,,; -connection user1; -SET GLOBAL max_password_errors=10; -SET max_password_errors=10; -ERROR HY000: Variable 'max_password_errors' is a GLOBAL variable and should be set with SET GLOBAL -SET SESSION max_password_errors=10; -ERROR HY000: Variable 'max_password_errors' is a GLOBAL variable and should be set with SET GLOBAL -disconnect user1; -connection default; -DROP USER user1@localhost; SET @@global.max_password_errors=@global; diff --git a/mysql-test/suite/sys_vars/r/max_tmp_tables_basic.result b/mysql-test/suite/sys_vars/r/max_tmp_tables_basic.result deleted file mode 100644 index dd00d1a0..00000000 --- a/mysql-test/suite/sys_vars/r/max_tmp_tables_basic.result +++ /dev/null @@ -1,251 +0,0 @@ -SET @start_global_value = @@global.max_tmp_tables; -SELECT @start_global_value; -@start_global_value -32 -SET @start_session_value = @@session.max_tmp_tables; -SELECT @start_session_value; -@start_session_value -32 -'#--------------------FN_DYNVARS_086_01-------------------------#' -SET @@global.max_tmp_tables = 1000; -Warnings: -Warning 1287 '@@max_tmp_tables' is deprecated and will be removed in a future release -SET @@global.max_tmp_tables = DEFAULT; -Warnings: -Warning 1287 '@@max_tmp_tables' is deprecated and will be removed in a future release -SELECT @@global.max_tmp_tables; -@@global.max_tmp_tables -32 -SET @@session.max_tmp_tables = 1000; -Warnings: -Warning 1287 '@@max_tmp_tables' is deprecated and will be removed in a future release -SET @@session.max_tmp_tables = DEFAULT; -Warnings: -Warning 1287 '@@max_tmp_tables' is deprecated and will be removed in a future release -SELECT @@session.max_tmp_tables; -@@session.max_tmp_tables -32 -'#--------------------FN_DYNVARS_086_02-------------------------#' -SET @@global.max_tmp_tables = DEFAULT; -Warnings: -Warning 1287 '@@max_tmp_tables' is deprecated and will be removed in a future release -SELECT @@global.max_tmp_tables = 32; -@@global.max_tmp_tables = 32 -1 -SET @@session.max_tmp_tables = DEFAULT; -Warnings: -Warning 1287 '@@max_tmp_tables' is deprecated and will be removed in a future release -SELECT @@session.max_tmp_tables = 32; -@@session.max_tmp_tables = 32 -1 -'#--------------------FN_DYNVARS_086_03-------------------------#' -SET @@global.max_tmp_tables = 1; -Warnings: -Warning 1287 '@@max_tmp_tables' is deprecated and will be removed in a future release -SELECT @@global.max_tmp_tables; -@@global.max_tmp_tables -1 -SET @@global.max_tmp_tables = 2; -Warnings: -Warning 1287 '@@max_tmp_tables' is deprecated and will be removed in a future release -SELECT @@global.max_tmp_tables; -@@global.max_tmp_tables -2 -SET @@global.max_tmp_tables = 65536; -Warnings: -Warning 1287 '@@max_tmp_tables' is deprecated and will be removed in a future release -SELECT @@global.max_tmp_tables; -@@global.max_tmp_tables -65536 -SET @@global.max_tmp_tables = 4294967295; -Warnings: -Warning 1287 '@@max_tmp_tables' is deprecated and will be removed in a future release -SELECT @@global.max_tmp_tables; -@@global.max_tmp_tables -4294967295 -SET @@global.max_tmp_tables = 4294967294; -Warnings: -Warning 1287 '@@max_tmp_tables' is deprecated and will be removed in a future release -SELECT @@global.max_tmp_tables; -@@global.max_tmp_tables -4294967294 -'#--------------------FN_DYNVARS_086_04-------------------------#' -SET @@session.max_tmp_tables = 1; -Warnings: -Warning 1287 '@@max_tmp_tables' is deprecated and will be removed in a future release -SELECT @@session.max_tmp_tables; -@@session.max_tmp_tables -1 -SET @@session.max_tmp_tables = 2; -Warnings: -Warning 1287 '@@max_tmp_tables' is deprecated and will be removed in a future release -SELECT @@session.max_tmp_tables; -@@session.max_tmp_tables -2 -SET @@session.max_tmp_tables = 65536; -Warnings: -Warning 1287 '@@max_tmp_tables' is deprecated and will be removed in a future release -SELECT @@session.max_tmp_tables; -@@session.max_tmp_tables -65536 -SET @@session.max_tmp_tables = 4294967295; -Warnings: -Warning 1287 '@@max_tmp_tables' is deprecated and will be removed in a future release -SELECT @@session.max_tmp_tables; -@@session.max_tmp_tables -4294967295 -SET @@session.max_tmp_tables = 4294967294; -Warnings: -Warning 1287 '@@max_tmp_tables' is deprecated and will be removed in a future release -SELECT @@session.max_tmp_tables; -@@session.max_tmp_tables -4294967294 -'#------------------FN_DYNVARS_086_05-----------------------#' -SET @@global.max_tmp_tables = -1024; -Warnings: -Warning 1287 '@@max_tmp_tables' is deprecated and will be removed in a future release -Warning 1292 Truncated incorrect max_tmp_tables value: '-1024' -SELECT @@global.max_tmp_tables; -@@global.max_tmp_tables -1 -SET @@global.max_tmp_tables = 4294967296; -Warnings: -Warning 1287 '@@max_tmp_tables' is deprecated and will be removed in a future release -Warning 1292 Truncated incorrect max_tmp_tables value: '4294967296' -SELECT @@global.max_tmp_tables; -@@global.max_tmp_tables -4294967295 -SET @@global.max_tmp_tables = -1; -Warnings: -Warning 1287 '@@max_tmp_tables' is deprecated and will be removed in a future release -Warning 1292 Truncated incorrect max_tmp_tables value: '-1' -SELECT @@global.max_tmp_tables; -@@global.max_tmp_tables -1 -SET @@global.max_tmp_tables = 429496729500; -Warnings: -Warning 1287 '@@max_tmp_tables' is deprecated and will be removed in a future release -Warning 1292 Truncated incorrect max_tmp_tables value: '429496729500' -SELECT @@global.max_tmp_tables; -@@global.max_tmp_tables -4294967295 -SET @@global.max_tmp_tables = 65530.34; -ERROR 42000: Incorrect argument type to variable 'max_tmp_tables' -SELECT @@global.max_tmp_tables; -@@global.max_tmp_tables -4294967295 -SET @@global.max_tmp_tables = test; -ERROR 42000: Incorrect argument type to variable 'max_tmp_tables' -SELECT @@global.max_tmp_tables; -@@global.max_tmp_tables -4294967295 -SET @@session.max_tmp_tables = 4294967296; -Warnings: -Warning 1287 '@@max_tmp_tables' is deprecated and will be removed in a future release -Warning 1292 Truncated incorrect max_tmp_tables value: '4294967296' -SELECT @@session.max_tmp_tables; -@@session.max_tmp_tables -4294967295 -SET @@session.max_tmp_tables = -1; -Warnings: -Warning 1287 '@@max_tmp_tables' is deprecated and will be removed in a future release -Warning 1292 Truncated incorrect max_tmp_tables value: '-1' -SELECT @@session.max_tmp_tables; -@@session.max_tmp_tables -1 -SET @@session.max_tmp_tables = 429496729500; -Warnings: -Warning 1287 '@@max_tmp_tables' is deprecated and will be removed in a future release -Warning 1292 Truncated incorrect max_tmp_tables value: '429496729500' -SELECT @@session.max_tmp_tables; -@@session.max_tmp_tables -4294967295 -SET @@session.max_tmp_tables = -001; -Warnings: -Warning 1287 '@@max_tmp_tables' is deprecated and will be removed in a future release -Warning 1292 Truncated incorrect max_tmp_tables value: '-1' -SELECT @@session.max_tmp_tables; -@@session.max_tmp_tables -1 -SET @@session.max_tmp_tables = 65530.34; -ERROR 42000: Incorrect argument type to variable 'max_tmp_tables' -SET @@session.max_tmp_tables = 10737418241; -Warnings: -Warning 1287 '@@max_tmp_tables' is deprecated and will be removed in a future release -Warning 1292 Truncated incorrect max_tmp_tables value: '10737418241' -SELECT @@session.max_tmp_tables; -@@session.max_tmp_tables -4294967295 -SET @@session.max_tmp_tables = test; -ERROR 42000: Incorrect argument type to variable 'max_tmp_tables' -SELECT @@session.max_tmp_tables; -@@session.max_tmp_tables -4294967295 -'#------------------FN_DYNVARS_086_06-----------------------#' -SELECT @@global.max_tmp_tables = VARIABLE_VALUE -FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES -WHERE VARIABLE_NAME='max_tmp_tables'; -@@global.max_tmp_tables = VARIABLE_VALUE -1 -'#------------------FN_DYNVARS_086_07-----------------------#' -SELECT @@session.max_tmp_tables = VARIABLE_VALUE -FROM INFORMATION_SCHEMA.SESSION_VARIABLES -WHERE VARIABLE_NAME='max_tmp_tables'; -@@session.max_tmp_tables = VARIABLE_VALUE -1 -'#------------------FN_DYNVARS_086_08-----------------------#' -SET @@global.max_tmp_tables = TRUE; -Warnings: -Warning 1287 '@@max_tmp_tables' is deprecated and will be removed in a future release -SELECT @@global.max_tmp_tables; -@@global.max_tmp_tables -1 -SET @@global.max_tmp_tables = FALSE; -Warnings: -Warning 1287 '@@max_tmp_tables' is deprecated and will be removed in a future release -Warning 1292 Truncated incorrect max_tmp_tables value: '0' -SELECT @@global.max_tmp_tables; -@@global.max_tmp_tables -1 -'#---------------------FN_DYNVARS_086_09----------------------#' -SET @@global.max_tmp_tables = 20; -Warnings: -Warning 1287 '@@max_tmp_tables' is deprecated and will be removed in a future release -SELECT @@max_tmp_tables = @@global.max_tmp_tables; -@@max_tmp_tables = @@global.max_tmp_tables -0 -'#---------------------FN_DYNVARS_086_10----------------------#' -SET @@max_tmp_tables = 255; -Warnings: -Warning 1287 '@@max_tmp_tables' is deprecated and will be removed in a future release -SELECT @@max_tmp_tables = @@local.max_tmp_tables; -@@max_tmp_tables = @@local.max_tmp_tables -1 -SELECT @@local.max_tmp_tables = @@session.max_tmp_tables; -@@local.max_tmp_tables = @@session.max_tmp_tables -1 -'#---------------------FN_DYNVARS_086_11----------------------#' -SET max_tmp_tables = 102; -Warnings: -Warning 1287 '@@max_tmp_tables' is deprecated and will be removed in a future release -SELECT @@max_tmp_tables; -@@max_tmp_tables -102 -SELECT local.max_tmp_tables; -ERROR 42S02: Unknown table 'local' in field list -SELECT session.max_tmp_tables; -ERROR 42S02: Unknown table 'session' in field list -SELECT max_tmp_tables = @@session.max_tmp_tables; -ERROR 42S22: Unknown column 'max_tmp_tables' in 'field list' -SET @@global.max_tmp_tables = @start_global_value; -Warnings: -Warning 1287 '@@max_tmp_tables' is deprecated and will be removed in a future release -SELECT @@global.max_tmp_tables; -@@global.max_tmp_tables -32 -SET @@session.max_tmp_tables = @start_session_value; -Warnings: -Warning 1287 '@@max_tmp_tables' is deprecated and will be removed in a future release -SELECT @@session.max_tmp_tables; -@@session.max_tmp_tables -32 diff --git a/mysql-test/suite/sys_vars/r/mdev_15935.result b/mysql-test/suite/sys_vars/r/mdev_15935.result new file mode 100644 index 00000000..551cd539 --- /dev/null +++ b/mysql-test/suite/sys_vars/r/mdev_15935.result @@ -0,0 +1,10 @@ +# +# test cleanup of sys_var classes +# +set global init_connect="................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................."; +ERROR HY000: String '......................................................................' is too long for init_connect (should be no longer than 2000) +set global ft_boolean_syntax="................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................."; +ERROR HY000: String '......................................................................' is too long for ft_boolean_syntax (should be no longer than 2000) +# +# end of test mdev_15935 +# diff --git a/mysql-test/suite/sys_vars/r/mdev_32254.result b/mysql-test/suite/sys_vars/r/mdev_32254.result new file mode 100644 index 00000000..5188c56e --- /dev/null +++ b/mysql-test/suite/sys_vars/r/mdev_32254.result @@ -0,0 +1,13 @@ +# +# MDEV-32254 Server crashes when adding records to table after setting redirect_url with empty variable +# +set @old_redirect_url=@@global.redirect_url; +set global redirect_url=@empty_value; +ERROR 42000: Variable 'redirect_url' can't be set to the value of 'NULL' +CREATE TABLE t (c1 INT) ENGINE=INNODB; +INSERT INTO t VALUES (1),(1); +drop table t; +set global redirect_url=@old_redirect_url; +# +# end of test mdev_32254 +# diff --git a/mysql-test/suite/sys_vars/r/mdev_32525.result b/mysql-test/suite/sys_vars/r/mdev_32525.result new file mode 100644 index 00000000..fd7af58d --- /dev/null +++ b/mysql-test/suite/sys_vars/r/mdev_32525.result @@ -0,0 +1,11 @@ +# +# MDEV-32525 Server startup fails to validate invalid redirect_url +# +FOUND 1 /\[ERROR\].*Invalid redirect_url: mariadbaaa://test/ in mdev_32525.err +# restart +select @@redirect_url; +@@redirect_url + +# +# end of test mdev_32525 +# diff --git a/mysql-test/suite/sys_vars/r/mdev_32640.result b/mysql-test/suite/sys_vars/r/mdev_32640.result new file mode 100644 index 00000000..ea93f3a7 --- /dev/null +++ b/mysql-test/suite/sys_vars/r/mdev_32640.result @@ -0,0 +1,15 @@ +PREPARE s_1 FROM 'SHOW RELAYLOG EVENTS'; +/* 1 */ SET default_master_connection='MASTER'; +/* 1 */ EXECUTE s_1; +ERROR HY000: There is no master connection 'MASTER' +/* 2 */ SET default_master_connection='MASTER'; +/* 2 */ EXECUTE s_1; +ERROR HY000: There is no master connection 'MASTER' +create procedure p() SHOW RELAYLOG EVENTS; +/* 1 */ SET default_master_connection='MASTER'; +/* 1 */ call p; +ERROR HY000: There is no master connection 'MASTER' +/* 2 */ SET default_master_connection='MASTER'; +/* 2 */ call p; +ERROR HY000: There is no master connection 'MASTER' +drop procedure p; diff --git a/mysql-test/suite/sys_vars/r/old_alter_table_basic.result b/mysql-test/suite/sys_vars/r/old_alter_table_basic.result deleted file mode 100644 index 3cc7fff7..00000000 --- a/mysql-test/suite/sys_vars/r/old_alter_table_basic.result +++ /dev/null @@ -1,130 +0,0 @@ -SET @start_global_value = @@global.old_alter_table; -SELECT @start_global_value; -@start_global_value -DEFAULT -select @@global.old_alter_table; -@@global.old_alter_table -DEFAULT -select @@session.old_alter_table; -@@session.old_alter_table -DEFAULT -show global variables like 'old_alter_table'; -Variable_name Value -old_alter_table DEFAULT -show session variables like 'old_alter_table'; -Variable_name Value -old_alter_table DEFAULT -select * from information_schema.global_variables where variable_name='old_alter_table'; -VARIABLE_NAME VARIABLE_VALUE -OLD_ALTER_TABLE DEFAULT -select * from information_schema.session_variables where variable_name='old_alter_table'; -VARIABLE_NAME VARIABLE_VALUE -OLD_ALTER_TABLE DEFAULT -set global old_alter_table=1; -Warnings: -Warning 1287 '@@old_alter_table' is deprecated and will be removed in a future release. Please use '@@alter_algorithm' instead -set session old_alter_table=1; -Warnings: -Warning 1287 '@@old_alter_table' is deprecated and will be removed in a future release. Please use '@@alter_algorithm' instead -select @@global.old_alter_table; -@@global.old_alter_table -COPY -select @@session.old_alter_table; -@@session.old_alter_table -COPY -show global variables like 'old_alter_table'; -Variable_name Value -old_alter_table COPY -show session variables like 'old_alter_table'; -Variable_name Value -old_alter_table COPY -select * from information_schema.global_variables where variable_name='old_alter_table'; -VARIABLE_NAME VARIABLE_VALUE -OLD_ALTER_TABLE COPY -select * from information_schema.session_variables where variable_name='old_alter_table'; -VARIABLE_NAME VARIABLE_VALUE -OLD_ALTER_TABLE COPY -set global old_alter_table=2; -Warnings: -Warning 1287 '@@old_alter_table' is deprecated and will be removed in a future release. Please use '@@alter_algorithm' instead -set session old_alter_table=2; -Warnings: -Warning 1287 '@@old_alter_table' is deprecated and will be removed in a future release. Please use '@@alter_algorithm' instead -select @@global.old_alter_table; -@@global.old_alter_table -INPLACE -select @@session.old_alter_table; -@@session.old_alter_table -INPLACE -show global variables like 'old_alter_table'; -Variable_name Value -old_alter_table INPLACE -show session variables like 'old_alter_table'; -Variable_name Value -old_alter_table INPLACE -select * from information_schema.global_variables where variable_name='old_alter_table'; -VARIABLE_NAME VARIABLE_VALUE -OLD_ALTER_TABLE INPLACE -select * from information_schema.session_variables where variable_name='old_alter_table'; -VARIABLE_NAME VARIABLE_VALUE -OLD_ALTER_TABLE INPLACE -set global old_alter_table=3; -Warnings: -Warning 1287 '@@old_alter_table' is deprecated and will be removed in a future release. Please use '@@alter_algorithm' instead -set session old_alter_table=3; -Warnings: -Warning 1287 '@@old_alter_table' is deprecated and will be removed in a future release. Please use '@@alter_algorithm' instead -select @@global.old_alter_table; -@@global.old_alter_table -NOCOPY -select @@session.old_alter_table; -@@session.old_alter_table -NOCOPY -show global variables like 'old_alter_table'; -Variable_name Value -old_alter_table NOCOPY -show session variables like 'old_alter_table'; -Variable_name Value -old_alter_table NOCOPY -select * from information_schema.global_variables where variable_name='old_alter_table'; -VARIABLE_NAME VARIABLE_VALUE -OLD_ALTER_TABLE NOCOPY -select * from information_schema.session_variables where variable_name='old_alter_table'; -VARIABLE_NAME VARIABLE_VALUE -OLD_ALTER_TABLE NOCOPY -set global old_alter_table=4; -Warnings: -Warning 1287 '@@old_alter_table' is deprecated and will be removed in a future release. Please use '@@alter_algorithm' instead -set session old_alter_table=4; -Warnings: -Warning 1287 '@@old_alter_table' is deprecated and will be removed in a future release. Please use '@@alter_algorithm' instead -select @@global.old_alter_table; -@@global.old_alter_table -INSTANT -select @@session.old_alter_table; -@@session.old_alter_table -INSTANT -show global variables like 'old_alter_table'; -Variable_name Value -old_alter_table INSTANT -show session variables like 'old_alter_table'; -Variable_name Value -old_alter_table INSTANT -select * from information_schema.global_variables where variable_name='old_alter_table'; -VARIABLE_NAME VARIABLE_VALUE -OLD_ALTER_TABLE INSTANT -select * from information_schema.session_variables where variable_name='old_alter_table'; -VARIABLE_NAME VARIABLE_VALUE -OLD_ALTER_TABLE INSTANT -set global old_alter_table=1.1; -ERROR 42000: Incorrect argument type to variable 'old_alter_table' -set global old_alter_table=1e1; -ERROR 42000: Incorrect argument type to variable 'old_alter_table' -set global old_alter_table="foo"; -ERROR 42000: Variable 'old_alter_table' can't be set to the value of 'foo' -SET @@global.old_alter_table = @start_global_value; -Warnings: -Warning 1287 '@@old_alter_table' is deprecated and will be removed in a future release. Please use '@@alter_algorithm' instead -SELECT @@global.old_alter_table; -@@global.old_alter_table -DEFAULT diff --git a/mysql-test/suite/sys_vars/r/old_mode_basic.result b/mysql-test/suite/sys_vars/r/old_mode_basic.result index 776d45a1..3032a825 100644 --- a/mysql-test/suite/sys_vars/r/old_mode_basic.result +++ b/mysql-test/suite/sys_vars/r/old_mode_basic.result @@ -8,11 +8,15 @@ SELECT @session_start_value; UTF8_IS_UTF8MB3 '#--------------------FN_DYNVARS_152_01------------------------#' SET @@global.old_mode = "NO_PROGRESS_INFO"; +Warnings: +Warning 1287 'NO_PROGRESS_INFO' is deprecated and will be removed in a future release SET @@global.old_mode = DEFAULT; SELECT @@global.old_mode; @@global.old_mode UTF8_IS_UTF8MB3 SET @@session.old_mode = "NO_PROGRESS_INFO"; +Warnings: +Warning 1287 'NO_PROGRESS_INFO' is deprecated and will be removed in a future release SET @@session.old_mode = DEFAULT; SELECT @@session.old_mode; @@session.old_mode @@ -40,20 +44,28 @@ SELECT @@session.old_mode; '#--------------------FN_DYNVARS_152_03------------------------#' SET @@global.old_mode = NO_PROGRESS_INFO; +Warnings: +Warning 1287 'NO_PROGRESS_INFO' is deprecated and will be removed in a future release SELECT @@global.old_mode; @@global.old_mode NO_PROGRESS_INFO SET @@global.old_mode = NO_DUP_KEY_WARNINGS_WITH_IGNORE; +Warnings: +Warning 1287 'NO_DUP_KEY_WARNINGS_WITH_IGNORE' is deprecated and will be removed in a future release SELECT @@global.old_mode; @@global.old_mode NO_DUP_KEY_WARNINGS_WITH_IGNORE SET @@global.old_mode = OFF; ERROR 42000: Variable 'old_mode' can't be set to the value of 'OFF' SET @@session.old_mode = NO_PROGRESS_INFO; +Warnings: +Warning 1287 'NO_PROGRESS_INFO' is deprecated and will be removed in a future release SELECT @@session.old_mode; @@session.old_mode NO_PROGRESS_INFO SET @@session.old_mode = NO_DUP_KEY_WARNINGS_WITH_IGNORE; +Warnings: +Warning 1287 'NO_DUP_KEY_WARNINGS_WITH_IGNORE' is deprecated and will be removed in a future release SELECT @@session.old_mode; @@session.old_mode NO_DUP_KEY_WARNINGS_WITH_IGNORE @@ -103,19 +115,25 @@ SELECT @@global.old_mode; @@global.old_mode SET @@global.old_mode = 1; +Warnings: +Warning 1287 'NO_DUP_KEY_WARNINGS_WITH_IGNORE' is deprecated and will be removed in a future release SELECT @@global.old_mode; @@global.old_mode NO_DUP_KEY_WARNINGS_WITH_IGNORE SET @@global.old_mode = 2; +Warnings: +Warning 1287 'NO_PROGRESS_INFO' is deprecated and will be removed in a future release SELECT @@global.old_mode; @@global.old_mode NO_PROGRESS_INFO SET @@global.old_mode = 4; +Warnings: +Warning 1287 'ZERO_DATE_TIME_CAST' is deprecated and will be removed in a future release SELECT @@global.old_mode; @@global.old_mode ZERO_DATE_TIME_CAST -SET @@global.old_mode = 128; -ERROR 42000: Variable 'old_mode' can't be set to the value of '128' +SET @@global.old_mode = 256; +ERROR 42000: Variable 'old_mode' can't be set to the value of '256' SELECT @@global.old_mode; @@global.old_mode ZERO_DATE_TIME_CAST @@ -123,6 +141,8 @@ SET @@global.old_mode = 0.4; ERROR 42000: Incorrect argument type to variable 'old_mode' '#---------------------FN_DYNVARS_152_08----------------------#' SET @@global.old_mode = TRUE; +Warnings: +Warning 1287 'NO_DUP_KEY_WARNINGS_WITH_IGNORE' is deprecated and will be removed in a future release SELECT @@global.old_mode; @@global.old_mode NO_DUP_KEY_WARNINGS_WITH_IGNORE @@ -132,7 +152,11 @@ SELECT @@global.old_mode; '#---------------------FN_DYNVARS_152_09----------------------#' SET old_mode = 'NO_PROGRESS_INFO'; +Warnings: +Warning 1287 'NO_PROGRESS_INFO' is deprecated and will be removed in a future release SET session old_mode = 1; +Warnings: +Warning 1287 'NO_DUP_KEY_WARNINGS_WITH_IGNORE' is deprecated and will be removed in a future release SELECT @@old_mode; @@old_mode NO_DUP_KEY_WARNINGS_WITH_IGNORE @@ -142,10 +166,16 @@ SELECT @@global.old_mode; '#---------------------FN_DYNVARS_152_10----------------------#' SET @@session.old_mode = 'NO_PROGRESS_INFO,NO_DUP_KEY_WARNINGS_WITH_IGNORE'; +Warnings: +Warning 1287 'NO_DUP_KEY_WARNINGS_WITH_IGNORE' is deprecated and will be removed in a future release +Warning 1287 'NO_PROGRESS_INFO' is deprecated and will be removed in a future release SELECT @@session.old_mode; @@session.old_mode NO_DUP_KEY_WARNINGS_WITH_IGNORE,NO_PROGRESS_INFO SET @@global.old_mode = 'NO_DUP_KEY_WARNINGS_WITH_IGNORE,NO_PROGRESS_INFO'; +Warnings: +Warning 1287 'NO_DUP_KEY_WARNINGS_WITH_IGNORE' is deprecated and will be removed in a future release +Warning 1287 'NO_PROGRESS_INFO' is deprecated and will be removed in a future release SELECT @@global.old_mode; @@global.old_mode NO_DUP_KEY_WARNINGS_WITH_IGNORE,NO_PROGRESS_INFO @@ -156,6 +186,8 @@ SELECT @@old_mode; @@old_mode SET @@old_mode=',,,,NO_PROGRESS_INFO,,,'; +Warnings: +Warning 1287 'NO_PROGRESS_INFO' is deprecated and will be removed in a future release SELECT @@old_mode; @@old_mode NO_PROGRESS_INFO @@ -292,10 +324,14 @@ SELECT @@OLD_MODE; UTF8_IS_UTF8MB3 SET @save_old_mode = @@OLD_MODE; SET @@OLD_MODE= IGNORE_INDEX_ONLY_FOR_JOIN; +Warnings: +Warning 1287 'IGNORE_INDEX_ONLY_FOR_JOIN' is deprecated and will be removed in a future release SELECT @@OLD_MODE; @@OLD_MODE IGNORE_INDEX_ONLY_FOR_JOIN SET @@OLD_MODE= COMPAT_5_1_CHECKSUM; +Warnings: +Warning 1287 'COMPAT_5_1_CHECKSUM' is deprecated and will be removed in a future release SELECT @@OLD_MODE; @@OLD_MODE COMPAT_5_1_CHECKSUM diff --git a/mysql-test/suite/sys_vars/r/old_passwords_func.result b/mysql-test/suite/sys_vars/r/old_passwords_func.result index fb250eeb..1220fb1a 100644 --- a/mysql-test/suite/sys_vars/r/old_passwords_func.result +++ b/mysql-test/suite/sys_vars/r/old_passwords_func.result @@ -21,7 +21,10 @@ SELECT CURRENT_USER(); CURRENT_USER() userNewPass2@localhost userNewPass2@localhost Expected -connect con3,localhost,userOldPass,pass3,; +connect(localhost,userOldPass,pass3,test,MASTER_MYPORT,MASTER_MYSOCK); +connect con3,localhost,userOldPass,pass3; +ERROR HY000: Authentication plugin 'mysql_old_password' couldn't be found in restricted_auth plugin list. +connect con3,localhost,userOldPass,pass3,,,,auth=mysql_old_password:mysql_native_password; SELECT CURRENT_USER(); CURRENT_USER() userOldPass@localhost diff --git a/mysql-test/suite/sys_vars/r/optimizer_switch_basic.result b/mysql-test/suite/sys_vars/r/optimizer_switch_basic.result index 8f5d9071..c0755278 100644 --- a/mysql-test/suite/sys_vars/r/optimizer_switch_basic.result +++ b/mysql-test/suite/sys_vars/r/optimizer_switch_basic.result @@ -1,60 +1,58 @@ set @@global.optimizer_switch=@@optimizer_switch; select @@global.optimizer_switch; @@global.optimizer_switch -index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,index_merge_sort_intersection=off,engine_condition_pushdown=off,index_condition_pushdown=on,derived_merge=on,derived_with_keys=on,firstmatch=on,loosescan=on,materialization=on,in_to_exists=on,semijoin=on,partial_match_rowid_merge=on,partial_match_table_scan=on,subquery_cache=on,mrr=off,mrr_cost_based=off,mrr_sort_keys=off,outer_join_with_cache=on,semijoin_with_cache=on,join_cache_incremental=on,join_cache_hashed=on,join_cache_bka=on,optimize_join_buffer_size=on,table_elimination=on,extended_keys=on,exists_to_in=on,orderby_uses_equalities=on,condition_pushdown_for_derived=on,split_materialized=on,condition_pushdown_for_subquery=on,rowid_filter=on,condition_pushdown_from_having=on,not_null_range_scan=off,hash_join_cardinality=off,cset_narrowing=off +index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,index_merge_sort_intersection=off,index_condition_pushdown=on,derived_merge=on,derived_with_keys=on,firstmatch=on,loosescan=on,materialization=on,in_to_exists=on,semijoin=on,partial_match_rowid_merge=on,partial_match_table_scan=on,subquery_cache=on,mrr=off,mrr_cost_based=off,mrr_sort_keys=off,outer_join_with_cache=on,semijoin_with_cache=on,join_cache_incremental=on,join_cache_hashed=on,join_cache_bka=on,optimize_join_buffer_size=on,table_elimination=on,extended_keys=on,exists_to_in=on,orderby_uses_equalities=on,condition_pushdown_for_derived=on,split_materialized=on,condition_pushdown_for_subquery=on,rowid_filter=on,condition_pushdown_from_having=on,not_null_range_scan=off,hash_join_cardinality=on,cset_narrowing=off,sargable_casefold=on select @@session.optimizer_switch; @@session.optimizer_switch -index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,index_merge_sort_intersection=off,engine_condition_pushdown=off,index_condition_pushdown=on,derived_merge=on,derived_with_keys=on,firstmatch=on,loosescan=on,materialization=on,in_to_exists=on,semijoin=on,partial_match_rowid_merge=on,partial_match_table_scan=on,subquery_cache=on,mrr=off,mrr_cost_based=off,mrr_sort_keys=off,outer_join_with_cache=on,semijoin_with_cache=on,join_cache_incremental=on,join_cache_hashed=on,join_cache_bka=on,optimize_join_buffer_size=on,table_elimination=on,extended_keys=on,exists_to_in=on,orderby_uses_equalities=on,condition_pushdown_for_derived=on,split_materialized=on,condition_pushdown_for_subquery=on,rowid_filter=on,condition_pushdown_from_having=on,not_null_range_scan=off,hash_join_cardinality=off,cset_narrowing=off +index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,index_merge_sort_intersection=off,index_condition_pushdown=on,derived_merge=on,derived_with_keys=on,firstmatch=on,loosescan=on,materialization=on,in_to_exists=on,semijoin=on,partial_match_rowid_merge=on,partial_match_table_scan=on,subquery_cache=on,mrr=off,mrr_cost_based=off,mrr_sort_keys=off,outer_join_with_cache=on,semijoin_with_cache=on,join_cache_incremental=on,join_cache_hashed=on,join_cache_bka=on,optimize_join_buffer_size=on,table_elimination=on,extended_keys=on,exists_to_in=on,orderby_uses_equalities=on,condition_pushdown_for_derived=on,split_materialized=on,condition_pushdown_for_subquery=on,rowid_filter=on,condition_pushdown_from_having=on,not_null_range_scan=off,hash_join_cardinality=on,cset_narrowing=off,sargable_casefold=on show global variables like 'optimizer_switch'; Variable_name Value -optimizer_switch index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,index_merge_sort_intersection=off,engine_condition_pushdown=off,index_condition_pushdown=on,derived_merge=on,derived_with_keys=on,firstmatch=on,loosescan=on,materialization=on,in_to_exists=on,semijoin=on,partial_match_rowid_merge=on,partial_match_table_scan=on,subquery_cache=on,mrr=off,mrr_cost_based=off,mrr_sort_keys=off,outer_join_with_cache=on,semijoin_with_cache=on,join_cache_incremental=on,join_cache_hashed=on,join_cache_bka=on,optimize_join_buffer_size=on,table_elimination=on,extended_keys=on,exists_to_in=on,orderby_uses_equalities=on,condition_pushdown_for_derived=on,split_materialized=on,condition_pushdown_for_subquery=on,rowid_filter=on,condition_pushdown_from_having=on,not_null_range_scan=off,hash_join_cardinality=off,cset_narrowing=off +optimizer_switch index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,index_merge_sort_intersection=off,index_condition_pushdown=on,derived_merge=on,derived_with_keys=on,firstmatch=on,loosescan=on,materialization=on,in_to_exists=on,semijoin=on,partial_match_rowid_merge=on,partial_match_table_scan=on,subquery_cache=on,mrr=off,mrr_cost_based=off,mrr_sort_keys=off,outer_join_with_cache=on,semijoin_with_cache=on,join_cache_incremental=on,join_cache_hashed=on,join_cache_bka=on,optimize_join_buffer_size=on,table_elimination=on,extended_keys=on,exists_to_in=on,orderby_uses_equalities=on,condition_pushdown_for_derived=on,split_materialized=on,condition_pushdown_for_subquery=on,rowid_filter=on,condition_pushdown_from_having=on,not_null_range_scan=off,hash_join_cardinality=on,cset_narrowing=off,sargable_casefold=on show session variables like 'optimizer_switch'; Variable_name Value -optimizer_switch index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,index_merge_sort_intersection=off,engine_condition_pushdown=off,index_condition_pushdown=on,derived_merge=on,derived_with_keys=on,firstmatch=on,loosescan=on,materialization=on,in_to_exists=on,semijoin=on,partial_match_rowid_merge=on,partial_match_table_scan=on,subquery_cache=on,mrr=off,mrr_cost_based=off,mrr_sort_keys=off,outer_join_with_cache=on,semijoin_with_cache=on,join_cache_incremental=on,join_cache_hashed=on,join_cache_bka=on,optimize_join_buffer_size=on,table_elimination=on,extended_keys=on,exists_to_in=on,orderby_uses_equalities=on,condition_pushdown_for_derived=on,split_materialized=on,condition_pushdown_for_subquery=on,rowid_filter=on,condition_pushdown_from_having=on,not_null_range_scan=off,hash_join_cardinality=off,cset_narrowing=off +optimizer_switch index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,index_merge_sort_intersection=off,index_condition_pushdown=on,derived_merge=on,derived_with_keys=on,firstmatch=on,loosescan=on,materialization=on,in_to_exists=on,semijoin=on,partial_match_rowid_merge=on,partial_match_table_scan=on,subquery_cache=on,mrr=off,mrr_cost_based=off,mrr_sort_keys=off,outer_join_with_cache=on,semijoin_with_cache=on,join_cache_incremental=on,join_cache_hashed=on,join_cache_bka=on,optimize_join_buffer_size=on,table_elimination=on,extended_keys=on,exists_to_in=on,orderby_uses_equalities=on,condition_pushdown_for_derived=on,split_materialized=on,condition_pushdown_for_subquery=on,rowid_filter=on,condition_pushdown_from_having=on,not_null_range_scan=off,hash_join_cardinality=on,cset_narrowing=off,sargable_casefold=on select * from information_schema.global_variables where variable_name='optimizer_switch'; VARIABLE_NAME VARIABLE_VALUE -OPTIMIZER_SWITCH index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,index_merge_sort_intersection=off,engine_condition_pushdown=off,index_condition_pushdown=on,derived_merge=on,derived_with_keys=on,firstmatch=on,loosescan=on,materialization=on,in_to_exists=on,semijoin=on,partial_match_rowid_merge=on,partial_match_table_scan=on,subquery_cache=on,mrr=off,mrr_cost_based=off,mrr_sort_keys=off,outer_join_with_cache=on,semijoin_with_cache=on,join_cache_incremental=on,join_cache_hashed=on,join_cache_bka=on,optimize_join_buffer_size=on,table_elimination=on,extended_keys=on,exists_to_in=on,orderby_uses_equalities=on,condition_pushdown_for_derived=on,split_materialized=on,condition_pushdown_for_subquery=on,rowid_filter=on,condition_pushdown_from_having=on,not_null_range_scan=off,hash_join_cardinality=off,cset_narrowing=off +OPTIMIZER_SWITCH index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,index_merge_sort_intersection=off,index_condition_pushdown=on,derived_merge=on,derived_with_keys=on,firstmatch=on,loosescan=on,materialization=on,in_to_exists=on,semijoin=on,partial_match_rowid_merge=on,partial_match_table_scan=on,subquery_cache=on,mrr=off,mrr_cost_based=off,mrr_sort_keys=off,outer_join_with_cache=on,semijoin_with_cache=on,join_cache_incremental=on,join_cache_hashed=on,join_cache_bka=on,optimize_join_buffer_size=on,table_elimination=on,extended_keys=on,exists_to_in=on,orderby_uses_equalities=on,condition_pushdown_for_derived=on,split_materialized=on,condition_pushdown_for_subquery=on,rowid_filter=on,condition_pushdown_from_having=on,not_null_range_scan=off,hash_join_cardinality=on,cset_narrowing=off,sargable_casefold=on select * from information_schema.session_variables where variable_name='optimizer_switch'; VARIABLE_NAME VARIABLE_VALUE -OPTIMIZER_SWITCH index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,index_merge_sort_intersection=off,engine_condition_pushdown=off,index_condition_pushdown=on,derived_merge=on,derived_with_keys=on,firstmatch=on,loosescan=on,materialization=on,in_to_exists=on,semijoin=on,partial_match_rowid_merge=on,partial_match_table_scan=on,subquery_cache=on,mrr=off,mrr_cost_based=off,mrr_sort_keys=off,outer_join_with_cache=on,semijoin_with_cache=on,join_cache_incremental=on,join_cache_hashed=on,join_cache_bka=on,optimize_join_buffer_size=on,table_elimination=on,extended_keys=on,exists_to_in=on,orderby_uses_equalities=on,condition_pushdown_for_derived=on,split_materialized=on,condition_pushdown_for_subquery=on,rowid_filter=on,condition_pushdown_from_having=on,not_null_range_scan=off,hash_join_cardinality=off,cset_narrowing=off -set global optimizer_switch=4101; -set session optimizer_switch=2058; +OPTIMIZER_SWITCH index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,index_merge_sort_intersection=off,index_condition_pushdown=on,derived_merge=on,derived_with_keys=on,firstmatch=on,loosescan=on,materialization=on,in_to_exists=on,semijoin=on,partial_match_rowid_merge=on,partial_match_table_scan=on,subquery_cache=on,mrr=off,mrr_cost_based=off,mrr_sort_keys=off,outer_join_with_cache=on,semijoin_with_cache=on,join_cache_incremental=on,join_cache_hashed=on,join_cache_bka=on,optimize_join_buffer_size=on,table_elimination=on,extended_keys=on,exists_to_in=on,orderby_uses_equalities=on,condition_pushdown_for_derived=on,split_materialized=on,condition_pushdown_for_subquery=on,rowid_filter=on,condition_pushdown_from_having=on,not_null_range_scan=off,hash_join_cardinality=on,cset_narrowing=off,sargable_casefold=on +set global optimizer_switch=2053; +set session optimizer_switch=1034; select @@global.optimizer_switch; @@global.optimizer_switch -index_merge=on,index_merge_union=off,index_merge_sort_union=on,index_merge_intersection=off,index_merge_sort_intersection=off,engine_condition_pushdown=off,index_condition_pushdown=off,derived_merge=off,derived_with_keys=off,firstmatch=off,loosescan=off,materialization=off,in_to_exists=on,semijoin=off,partial_match_rowid_merge=off,partial_match_table_scan=off,subquery_cache=off,mrr=off,mrr_cost_based=off,mrr_sort_keys=off,outer_join_with_cache=off,semijoin_with_cache=off,join_cache_incremental=off,join_cache_hashed=off,join_cache_bka=off,optimize_join_buffer_size=off,table_elimination=off,extended_keys=off,exists_to_in=off,orderby_uses_equalities=off,condition_pushdown_for_derived=off,split_materialized=off,condition_pushdown_for_subquery=off,rowid_filter=off,condition_pushdown_from_having=off,not_null_range_scan=off,hash_join_cardinality=off,cset_narrowing=off +index_merge=on,index_merge_union=off,index_merge_sort_union=on,index_merge_intersection=off,index_merge_sort_intersection=off,index_condition_pushdown=off,derived_merge=off,derived_with_keys=off,firstmatch=off,loosescan=off,materialization=off,in_to_exists=on,semijoin=off,partial_match_rowid_merge=off,partial_match_table_scan=off,subquery_cache=off,mrr=off,mrr_cost_based=off,mrr_sort_keys=off,outer_join_with_cache=off,semijoin_with_cache=off,join_cache_incremental=off,join_cache_hashed=off,join_cache_bka=off,optimize_join_buffer_size=off,table_elimination=off,extended_keys=off,exists_to_in=off,orderby_uses_equalities=off,condition_pushdown_for_derived=off,split_materialized=off,condition_pushdown_for_subquery=off,rowid_filter=off,condition_pushdown_from_having=off,not_null_range_scan=off,hash_join_cardinality=off,cset_narrowing=off,sargable_casefold=off select @@session.optimizer_switch; @@session.optimizer_switch -index_merge=off,index_merge_union=on,index_merge_sort_union=off,index_merge_intersection=on,index_merge_sort_intersection=off,engine_condition_pushdown=off,index_condition_pushdown=off,derived_merge=off,derived_with_keys=off,firstmatch=off,loosescan=off,materialization=on,in_to_exists=off,semijoin=off,partial_match_rowid_merge=off,partial_match_table_scan=off,subquery_cache=off,mrr=off,mrr_cost_based=off,mrr_sort_keys=off,outer_join_with_cache=off,semijoin_with_cache=off,join_cache_incremental=off,join_cache_hashed=off,join_cache_bka=off,optimize_join_buffer_size=off,table_elimination=off,extended_keys=off,exists_to_in=off,orderby_uses_equalities=off,condition_pushdown_for_derived=off,split_materialized=off,condition_pushdown_for_subquery=off,rowid_filter=off,condition_pushdown_from_having=off,not_null_range_scan=off,hash_join_cardinality=off,cset_narrowing=off +index_merge=off,index_merge_union=on,index_merge_sort_union=off,index_merge_intersection=on,index_merge_sort_intersection=off,index_condition_pushdown=off,derived_merge=off,derived_with_keys=off,firstmatch=off,loosescan=off,materialization=on,in_to_exists=off,semijoin=off,partial_match_rowid_merge=off,partial_match_table_scan=off,subquery_cache=off,mrr=off,mrr_cost_based=off,mrr_sort_keys=off,outer_join_with_cache=off,semijoin_with_cache=off,join_cache_incremental=off,join_cache_hashed=off,join_cache_bka=off,optimize_join_buffer_size=off,table_elimination=off,extended_keys=off,exists_to_in=off,orderby_uses_equalities=off,condition_pushdown_for_derived=off,split_materialized=off,condition_pushdown_for_subquery=off,rowid_filter=off,condition_pushdown_from_having=off,not_null_range_scan=off,hash_join_cardinality=off,cset_narrowing=off,sargable_casefold=off set global optimizer_switch="index_merge_sort_union=on"; set session optimizer_switch="index_merge=off"; select @@global.optimizer_switch; @@global.optimizer_switch -index_merge=on,index_merge_union=off,index_merge_sort_union=on,index_merge_intersection=off,index_merge_sort_intersection=off,engine_condition_pushdown=off,index_condition_pushdown=off,derived_merge=off,derived_with_keys=off,firstmatch=off,loosescan=off,materialization=off,in_to_exists=on,semijoin=off,partial_match_rowid_merge=off,partial_match_table_scan=off,subquery_cache=off,mrr=off,mrr_cost_based=off,mrr_sort_keys=off,outer_join_with_cache=off,semijoin_with_cache=off,join_cache_incremental=off,join_cache_hashed=off,join_cache_bka=off,optimize_join_buffer_size=off,table_elimination=off,extended_keys=off,exists_to_in=off,orderby_uses_equalities=off,condition_pushdown_for_derived=off,split_materialized=off,condition_pushdown_for_subquery=off,rowid_filter=off,condition_pushdown_from_having=off,not_null_range_scan=off,hash_join_cardinality=off,cset_narrowing=off +index_merge=on,index_merge_union=off,index_merge_sort_union=on,index_merge_intersection=off,index_merge_sort_intersection=off,index_condition_pushdown=off,derived_merge=off,derived_with_keys=off,firstmatch=off,loosescan=off,materialization=off,in_to_exists=on,semijoin=off,partial_match_rowid_merge=off,partial_match_table_scan=off,subquery_cache=off,mrr=off,mrr_cost_based=off,mrr_sort_keys=off,outer_join_with_cache=off,semijoin_with_cache=off,join_cache_incremental=off,join_cache_hashed=off,join_cache_bka=off,optimize_join_buffer_size=off,table_elimination=off,extended_keys=off,exists_to_in=off,orderby_uses_equalities=off,condition_pushdown_for_derived=off,split_materialized=off,condition_pushdown_for_subquery=off,rowid_filter=off,condition_pushdown_from_having=off,not_null_range_scan=off,hash_join_cardinality=off,cset_narrowing=off,sargable_casefold=off select @@session.optimizer_switch; @@session.optimizer_switch -index_merge=off,index_merge_union=on,index_merge_sort_union=off,index_merge_intersection=on,index_merge_sort_intersection=off,engine_condition_pushdown=off,index_condition_pushdown=off,derived_merge=off,derived_with_keys=off,firstmatch=off,loosescan=off,materialization=on,in_to_exists=off,semijoin=off,partial_match_rowid_merge=off,partial_match_table_scan=off,subquery_cache=off,mrr=off,mrr_cost_based=off,mrr_sort_keys=off,outer_join_with_cache=off,semijoin_with_cache=off,join_cache_incremental=off,join_cache_hashed=off,join_cache_bka=off,optimize_join_buffer_size=off,table_elimination=off,extended_keys=off,exists_to_in=off,orderby_uses_equalities=off,condition_pushdown_for_derived=off,split_materialized=off,condition_pushdown_for_subquery=off,rowid_filter=off,condition_pushdown_from_having=off,not_null_range_scan=off,hash_join_cardinality=off,cset_narrowing=off +index_merge=off,index_merge_union=on,index_merge_sort_union=off,index_merge_intersection=on,index_merge_sort_intersection=off,index_condition_pushdown=off,derived_merge=off,derived_with_keys=off,firstmatch=off,loosescan=off,materialization=on,in_to_exists=off,semijoin=off,partial_match_rowid_merge=off,partial_match_table_scan=off,subquery_cache=off,mrr=off,mrr_cost_based=off,mrr_sort_keys=off,outer_join_with_cache=off,semijoin_with_cache=off,join_cache_incremental=off,join_cache_hashed=off,join_cache_bka=off,optimize_join_buffer_size=off,table_elimination=off,extended_keys=off,exists_to_in=off,orderby_uses_equalities=off,condition_pushdown_for_derived=off,split_materialized=off,condition_pushdown_for_subquery=off,rowid_filter=off,condition_pushdown_from_having=off,not_null_range_scan=off,hash_join_cardinality=off,cset_narrowing=off,sargable_casefold=off show global variables like 'optimizer_switch'; Variable_name Value -optimizer_switch index_merge=on,index_merge_union=off,index_merge_sort_union=on,index_merge_intersection=off,index_merge_sort_intersection=off,engine_condition_pushdown=off,index_condition_pushdown=off,derived_merge=off,derived_with_keys=off,firstmatch=off,loosescan=off,materialization=off,in_to_exists=on,semijoin=off,partial_match_rowid_merge=off,partial_match_table_scan=off,subquery_cache=off,mrr=off,mrr_cost_based=off,mrr_sort_keys=off,outer_join_with_cache=off,semijoin_with_cache=off,join_cache_incremental=off,join_cache_hashed=off,join_cache_bka=off,optimize_join_buffer_size=off,table_elimination=off,extended_keys=off,exists_to_in=off,orderby_uses_equalities=off,condition_pushdown_for_derived=off,split_materialized=off,condition_pushdown_for_subquery=off,rowid_filter=off,condition_pushdown_from_having=off,not_null_range_scan=off,hash_join_cardinality=off,cset_narrowing=off +optimizer_switch index_merge=on,index_merge_union=off,index_merge_sort_union=on,index_merge_intersection=off,index_merge_sort_intersection=off,index_condition_pushdown=off,derived_merge=off,derived_with_keys=off,firstmatch=off,loosescan=off,materialization=off,in_to_exists=on,semijoin=off,partial_match_rowid_merge=off,partial_match_table_scan=off,subquery_cache=off,mrr=off,mrr_cost_based=off,mrr_sort_keys=off,outer_join_with_cache=off,semijoin_with_cache=off,join_cache_incremental=off,join_cache_hashed=off,join_cache_bka=off,optimize_join_buffer_size=off,table_elimination=off,extended_keys=off,exists_to_in=off,orderby_uses_equalities=off,condition_pushdown_for_derived=off,split_materialized=off,condition_pushdown_for_subquery=off,rowid_filter=off,condition_pushdown_from_having=off,not_null_range_scan=off,hash_join_cardinality=off,cset_narrowing=off,sargable_casefold=off show session variables like 'optimizer_switch'; Variable_name Value -optimizer_switch index_merge=off,index_merge_union=on,index_merge_sort_union=off,index_merge_intersection=on,index_merge_sort_intersection=off,engine_condition_pushdown=off,index_condition_pushdown=off,derived_merge=off,derived_with_keys=off,firstmatch=off,loosescan=off,materialization=on,in_to_exists=off,semijoin=off,partial_match_rowid_merge=off,partial_match_table_scan=off,subquery_cache=off,mrr=off,mrr_cost_based=off,mrr_sort_keys=off,outer_join_with_cache=off,semijoin_with_cache=off,join_cache_incremental=off,join_cache_hashed=off,join_cache_bka=off,optimize_join_buffer_size=off,table_elimination=off,extended_keys=off,exists_to_in=off,orderby_uses_equalities=off,condition_pushdown_for_derived=off,split_materialized=off,condition_pushdown_for_subquery=off,rowid_filter=off,condition_pushdown_from_having=off,not_null_range_scan=off,hash_join_cardinality=off,cset_narrowing=off +optimizer_switch index_merge=off,index_merge_union=on,index_merge_sort_union=off,index_merge_intersection=on,index_merge_sort_intersection=off,index_condition_pushdown=off,derived_merge=off,derived_with_keys=off,firstmatch=off,loosescan=off,materialization=on,in_to_exists=off,semijoin=off,partial_match_rowid_merge=off,partial_match_table_scan=off,subquery_cache=off,mrr=off,mrr_cost_based=off,mrr_sort_keys=off,outer_join_with_cache=off,semijoin_with_cache=off,join_cache_incremental=off,join_cache_hashed=off,join_cache_bka=off,optimize_join_buffer_size=off,table_elimination=off,extended_keys=off,exists_to_in=off,orderby_uses_equalities=off,condition_pushdown_for_derived=off,split_materialized=off,condition_pushdown_for_subquery=off,rowid_filter=off,condition_pushdown_from_having=off,not_null_range_scan=off,hash_join_cardinality=off,cset_narrowing=off,sargable_casefold=off select * from information_schema.global_variables where variable_name='optimizer_switch'; VARIABLE_NAME VARIABLE_VALUE -OPTIMIZER_SWITCH index_merge=on,index_merge_union=off,index_merge_sort_union=on,index_merge_intersection=off,index_merge_sort_intersection=off,engine_condition_pushdown=off,index_condition_pushdown=off,derived_merge=off,derived_with_keys=off,firstmatch=off,loosescan=off,materialization=off,in_to_exists=on,semijoin=off,partial_match_rowid_merge=off,partial_match_table_scan=off,subquery_cache=off,mrr=off,mrr_cost_based=off,mrr_sort_keys=off,outer_join_with_cache=off,semijoin_with_cache=off,join_cache_incremental=off,join_cache_hashed=off,join_cache_bka=off,optimize_join_buffer_size=off,table_elimination=off,extended_keys=off,exists_to_in=off,orderby_uses_equalities=off,condition_pushdown_for_derived=off,split_materialized=off,condition_pushdown_for_subquery=off,rowid_filter=off,condition_pushdown_from_having=off,not_null_range_scan=off,hash_join_cardinality=off,cset_narrowing=off +OPTIMIZER_SWITCH index_merge=on,index_merge_union=off,index_merge_sort_union=on,index_merge_intersection=off,index_merge_sort_intersection=off,index_condition_pushdown=off,derived_merge=off,derived_with_keys=off,firstmatch=off,loosescan=off,materialization=off,in_to_exists=on,semijoin=off,partial_match_rowid_merge=off,partial_match_table_scan=off,subquery_cache=off,mrr=off,mrr_cost_based=off,mrr_sort_keys=off,outer_join_with_cache=off,semijoin_with_cache=off,join_cache_incremental=off,join_cache_hashed=off,join_cache_bka=off,optimize_join_buffer_size=off,table_elimination=off,extended_keys=off,exists_to_in=off,orderby_uses_equalities=off,condition_pushdown_for_derived=off,split_materialized=off,condition_pushdown_for_subquery=off,rowid_filter=off,condition_pushdown_from_having=off,not_null_range_scan=off,hash_join_cardinality=off,cset_narrowing=off,sargable_casefold=off select * from information_schema.session_variables where variable_name='optimizer_switch'; VARIABLE_NAME VARIABLE_VALUE -OPTIMIZER_SWITCH index_merge=off,index_merge_union=on,index_merge_sort_union=off,index_merge_intersection=on,index_merge_sort_intersection=off,engine_condition_pushdown=off,index_condition_pushdown=off,derived_merge=off,derived_with_keys=off,firstmatch=off,loosescan=off,materialization=on,in_to_exists=off,semijoin=off,partial_match_rowid_merge=off,partial_match_table_scan=off,subquery_cache=off,mrr=off,mrr_cost_based=off,mrr_sort_keys=off,outer_join_with_cache=off,semijoin_with_cache=off,join_cache_incremental=off,join_cache_hashed=off,join_cache_bka=off,optimize_join_buffer_size=off,table_elimination=off,extended_keys=off,exists_to_in=off,orderby_uses_equalities=off,condition_pushdown_for_derived=off,split_materialized=off,condition_pushdown_for_subquery=off,rowid_filter=off,condition_pushdown_from_having=off,not_null_range_scan=off,hash_join_cardinality=off,cset_narrowing=off +OPTIMIZER_SWITCH index_merge=off,index_merge_union=on,index_merge_sort_union=off,index_merge_intersection=on,index_merge_sort_intersection=off,index_condition_pushdown=off,derived_merge=off,derived_with_keys=off,firstmatch=off,loosescan=off,materialization=on,in_to_exists=off,semijoin=off,partial_match_rowid_merge=off,partial_match_table_scan=off,subquery_cache=off,mrr=off,mrr_cost_based=off,mrr_sort_keys=off,outer_join_with_cache=off,semijoin_with_cache=off,join_cache_incremental=off,join_cache_hashed=off,join_cache_bka=off,optimize_join_buffer_size=off,table_elimination=off,extended_keys=off,exists_to_in=off,orderby_uses_equalities=off,condition_pushdown_for_derived=off,split_materialized=off,condition_pushdown_for_subquery=off,rowid_filter=off,condition_pushdown_from_having=off,not_null_range_scan=off,hash_join_cardinality=off,cset_narrowing=off,sargable_casefold=off set session optimizer_switch="default"; select @@session.optimizer_switch; @@session.optimizer_switch -index_merge=on,index_merge_union=off,index_merge_sort_union=on,index_merge_intersection=off,index_merge_sort_intersection=off,engine_condition_pushdown=off,index_condition_pushdown=off,derived_merge=off,derived_with_keys=off,firstmatch=off,loosescan=off,materialization=off,in_to_exists=on,semijoin=off,partial_match_rowid_merge=off,partial_match_table_scan=off,subquery_cache=off,mrr=off,mrr_cost_based=off,mrr_sort_keys=off,outer_join_with_cache=off,semijoin_with_cache=off,join_cache_incremental=off,join_cache_hashed=off,join_cache_bka=off,optimize_join_buffer_size=off,table_elimination=off,extended_keys=off,exists_to_in=off,orderby_uses_equalities=off,condition_pushdown_for_derived=off,split_materialized=off,condition_pushdown_for_subquery=off,rowid_filter=off,condition_pushdown_from_having=off,not_null_range_scan=off,hash_join_cardinality=off,cset_narrowing=off +index_merge=on,index_merge_union=off,index_merge_sort_union=on,index_merge_intersection=off,index_merge_sort_intersection=off,index_condition_pushdown=off,derived_merge=off,derived_with_keys=off,firstmatch=off,loosescan=off,materialization=off,in_to_exists=on,semijoin=off,partial_match_rowid_merge=off,partial_match_table_scan=off,subquery_cache=off,mrr=off,mrr_cost_based=off,mrr_sort_keys=off,outer_join_with_cache=off,semijoin_with_cache=off,join_cache_incremental=off,join_cache_hashed=off,join_cache_bka=off,optimize_join_buffer_size=off,table_elimination=off,extended_keys=off,exists_to_in=off,orderby_uses_equalities=off,condition_pushdown_for_derived=off,split_materialized=off,condition_pushdown_for_subquery=off,rowid_filter=off,condition_pushdown_from_having=off,not_null_range_scan=off,hash_join_cardinality=off,cset_narrowing=off,sargable_casefold=off set optimizer_switch = replace(@@optimizer_switch, '=off', '=on'); -Warnings: -Warning 1681 'engine_condition_pushdown=on' is deprecated and will be removed in a future release select @@optimizer_switch; @@optimizer_switch -index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,index_merge_sort_intersection=on,engine_condition_pushdown=on,index_condition_pushdown=on,derived_merge=on,derived_with_keys=on,firstmatch=on,loosescan=on,materialization=on,in_to_exists=on,semijoin=on,partial_match_rowid_merge=on,partial_match_table_scan=on,subquery_cache=on,mrr=on,mrr_cost_based=on,mrr_sort_keys=on,outer_join_with_cache=on,semijoin_with_cache=on,join_cache_incremental=on,join_cache_hashed=on,join_cache_bka=on,optimize_join_buffer_size=on,table_elimination=on,extended_keys=on,exists_to_in=on,orderby_uses_equalities=on,condition_pushdown_for_derived=on,split_materialized=on,condition_pushdown_for_subquery=on,rowid_filter=on,condition_pushdown_from_having=on,not_null_range_scan=on,hash_join_cardinality=on,cset_narrowing=on +index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,index_merge_sort_intersection=on,index_condition_pushdown=on,derived_merge=on,derived_with_keys=on,firstmatch=on,loosescan=on,materialization=on,in_to_exists=on,semijoin=on,partial_match_rowid_merge=on,partial_match_table_scan=on,subquery_cache=on,mrr=on,mrr_cost_based=on,mrr_sort_keys=on,outer_join_with_cache=on,semijoin_with_cache=on,join_cache_incremental=on,join_cache_hashed=on,join_cache_bka=on,optimize_join_buffer_size=on,table_elimination=on,extended_keys=on,exists_to_in=on,orderby_uses_equalities=on,condition_pushdown_for_derived=on,split_materialized=on,condition_pushdown_for_subquery=on,rowid_filter=on,condition_pushdown_from_having=on,not_null_range_scan=on,hash_join_cardinality=on,cset_narrowing=on,sargable_casefold=on set global optimizer_switch=1.1; ERROR 42000: Incorrect argument type to variable 'optimizer_switch' set global optimizer_switch=1e1; diff --git a/mysql-test/suite/sys_vars/r/preudo_thread_id_grant.result b/mysql-test/suite/sys_vars/r/preudo_thread_id_grant.result index d306a192..8ac8e32d 100644 --- a/mysql-test/suite/sys_vars/r/preudo_thread_id_grant.result +++ b/mysql-test/suite/sys_vars/r/preudo_thread_id_grant.result @@ -2,18 +2,18 @@ # MDEV-21975 Add BINLOG REPLAY privilege and bind new privileges to gtid_seq_no, preudo_thread_id, server_id, gtid_domain_id # SET @session=@@session.pseudo_thread_id; -# Test that "SET pseudo_thread_id" is not allowed without BINLOG REPLAY or SUPER +# Test that "SET pseudo_thread_id" is not allowed without BINLOG REPLAY CREATE USER user1@localhost; GRANT ALL PRIVILEGES ON *.* TO user1@localhost; -REVOKE BINLOG REPLAY, SUPER ON *.* FROM user1@localhost; +REVOKE BINLOG REPLAY ON *.* FROM user1@localhost; connect user1,localhost,user1,,; connection user1; SET GLOBAL pseudo_thread_id=1; ERROR HY000: Variable 'pseudo_thread_id' is a SESSION variable and can't be used with SET GLOBAL SET pseudo_thread_id=1; -ERROR 42000: Access denied; you need (at least one of) the SUPER, BINLOG REPLAY privilege(s) for this operation +ERROR 42000: Access denied; you need (at least one of) the BINLOG REPLAY privilege(s) for this operation SET SESSION pseudo_thread_id=1; -ERROR 42000: Access denied; you need (at least one of) the SUPER, BINLOG REPLAY privilege(s) for this operation +ERROR 42000: Access denied; you need (at least one of) the BINLOG REPLAY privilege(s) for this operation disconnect user1; connection default; DROP USER user1@localhost; @@ -29,16 +29,4 @@ SET SESSION pseudo_thread_id=1; disconnect user1; connection default; DROP USER user1@localhost; -# Test that "SET pseudo_thread_id" is allowed with SUPER -CREATE USER user1@localhost; -GRANT SUPER ON *.* TO user1@localhost; -connect user1,localhost,user1,,; -connection user1; -SET GLOBAL pseudo_thread_id=1; -ERROR HY000: Variable 'pseudo_thread_id' is a SESSION variable and can't be used with SET GLOBAL -SET pseudo_thread_id=1; -SET SESSION pseudo_thread_id=1; -disconnect user1; -connection default; -DROP USER user1@localhost; SET @@session.pseudo_thread_id=@session; diff --git a/mysql-test/suite/sys_vars/r/proxy_protocol_networks_grant.result b/mysql-test/suite/sys_vars/r/proxy_protocol_networks_grant.result index b6bae272..90419a80 100644 --- a/mysql-test/suite/sys_vars/r/proxy_protocol_networks_grant.result +++ b/mysql-test/suite/sys_vars/r/proxy_protocol_networks_grant.result @@ -2,14 +2,14 @@ SET @global=@@global.proxy_protocol_networks; # # MDEV-21961 Bind CONNECTION ADMIN to a number of global system variables # -# Test that "SET proxy_protocol_networks" is not allowed without CONNECTION ADMIN or SUPER +# Test that "SET proxy_protocol_networks" is not allowed without CONNECTION ADMIN CREATE USER user1@localhost; GRANT ALL PRIVILEGES ON *.* TO user1@localhost; -REVOKE CONNECTION ADMIN, SUPER ON *.* FROM user1@localhost; +REVOKE CONNECTION ADMIN ON *.* FROM user1@localhost; connect user1,localhost,user1,,; connection user1; SET GLOBAL proxy_protocol_networks=""; -ERROR 42000: Access denied; you need (at least one of) the SUPER, CONNECTION ADMIN privilege(s) for this operation +ERROR 42000: Access denied; you need (at least one of) the CONNECTION ADMIN privilege(s) for this operation SET proxy_protocol_networks=""; ERROR HY000: Variable 'proxy_protocol_networks' is a GLOBAL variable and should be set with SET GLOBAL SET SESSION proxy_protocol_networks=""; @@ -30,17 +30,4 @@ ERROR HY000: Variable 'proxy_protocol_networks' is a GLOBAL variable and should disconnect user1; connection default; DROP USER user1@localhost; -# Test that "SET proxy_protocol_networks" is allowed with SUPER -CREATE USER user1@localhost; -GRANT SUPER ON *.* TO user1@localhost; -connect user1,localhost,user1,,; -connection user1; -SET GLOBAL proxy_protocol_networks=""; -SET proxy_protocol_networks=""; -ERROR HY000: Variable 'proxy_protocol_networks' is a GLOBAL variable and should be set with SET GLOBAL -SET SESSION proxy_protocol_networks=""; -ERROR HY000: Variable 'proxy_protocol_networks' is a GLOBAL variable and should be set with SET GLOBAL -disconnect user1; -connection default; -DROP USER user1@localhost; SET @@global.proxy_protocol_networks=@global; diff --git a/mysql-test/suite/sys_vars/r/read_binlog_speed_limit_grant.result b/mysql-test/suite/sys_vars/r/read_binlog_speed_limit_grant.result index 03536c1c..73a2127e 100644 --- a/mysql-test/suite/sys_vars/r/read_binlog_speed_limit_grant.result +++ b/mysql-test/suite/sys_vars/r/read_binlog_speed_limit_grant.result @@ -2,14 +2,14 @@ # MDEV-21966 Bind REPLICATION SLAVE ADMIN to a number of global system variables # SET @global=@@global.read_binlog_speed_limit; -# Test that "SET read_binlog_speed_limit" is not allowed without REPLICATION SLAVE ADMIN or SUPER +# Test that "SET read_binlog_speed_limit" is not allowed without REPLICATION SLAVE ADMIN CREATE USER user1@localhost; GRANT ALL PRIVILEGES ON *.* TO user1@localhost; -REVOKE REPLICATION SLAVE ADMIN, SUPER ON *.* FROM user1@localhost; +REVOKE REPLICATION SLAVE ADMIN ON *.* FROM user1@localhost; connect user1,localhost,user1,,; connection user1; SET GLOBAL read_binlog_speed_limit=65536; -ERROR 42000: Access denied; you need (at least one of) the SUPER, REPLICATION SLAVE ADMIN privilege(s) for this operation +ERROR 42000: Access denied; you need (at least one of) the REPLICATION SLAVE ADMIN privilege(s) for this operation SET read_binlog_speed_limit=65536; ERROR HY000: Variable 'read_binlog_speed_limit' is a GLOBAL variable and should be set with SET GLOBAL SET SESSION read_binlog_speed_limit=65536; @@ -30,17 +30,4 @@ ERROR HY000: Variable 'read_binlog_speed_limit' is a GLOBAL variable and should disconnect user1; connection default; DROP USER user1@localhost; -# Test that "SET read_binlog_speed_limit" is allowed with SUPER -CREATE USER user1@localhost; -GRANT SUPER ON *.* TO user1@localhost; -connect user1,localhost,user1,,; -connection user1; -SET GLOBAL read_binlog_speed_limit=65536; -SET read_binlog_speed_limit=65536; -ERROR HY000: Variable 'read_binlog_speed_limit' is a GLOBAL variable and should be set with SET GLOBAL -SET SESSION read_binlog_speed_limit=65536; -ERROR HY000: Variable 'read_binlog_speed_limit' is a GLOBAL variable and should be set with SET GLOBAL -disconnect user1; -connection default; -DROP USER user1@localhost; SET @@global.read_binlog_speed_limit=@global; diff --git a/mysql-test/suite/sys_vars/r/read_only_grant.result b/mysql-test/suite/sys_vars/r/read_only_grant.result index 455390eb..fd908b0e 100644 --- a/mysql-test/suite/sys_vars/r/read_only_grant.result +++ b/mysql-test/suite/sys_vars/r/read_only_grant.result @@ -36,5 +36,5 @@ insert mysql.global_priv values ('bar', 'foo', '{"access":32768,"version_id":101 flush privileges; show grants for foo@bar; Grants for foo@bar -GRANT SUPER, READ_ONLY ADMIN ON *.* TO `foo`@`bar` +GRANT SUPER, BINLOG MONITOR, SET USER, FEDERATED ADMIN, CONNECTION ADMIN, READ_ONLY ADMIN, REPLICATION SLAVE ADMIN, REPLICATION MASTER ADMIN, BINLOG ADMIN, BINLOG REPLAY, SLAVE MONITOR ON *.* TO `foo`@`bar` drop user foo@bar; diff --git a/mysql-test/suite/sys_vars/r/redirect.result b/mysql-test/suite/sys_vars/r/redirect.result new file mode 100644 index 00000000..7d704de3 --- /dev/null +++ b/mysql-test/suite/sys_vars/r/redirect.result @@ -0,0 +1,81 @@ +# +# MDEV-15935 Connection Redirection Mechanism in MariaDB Client/Server Protocol +# +connect con,localhost,anyone_but_root; +select @@redirect_url; +@@redirect_url +mysql://foobar +connection default; +set @old_global_redirect_url=@@global.redirect_url; +set @old_session_redirect_url=@@session.redirect_url; +set @old_session_track_system_variables=@@session_track_system_variables; +set session_track_system_variables=""; +select @@global.redirect_url; +@@global.redirect_url + +set global redirect_url=default; +select @@global.redirect_url; +@@global.redirect_url + +set global redirect_url="mariadb.org"; +ERROR 42000: Variable 'redirect_url' can't be set to the value of 'mariadb.org' +set global redirect_url="https://mariadb.org"; +ERROR 42000: Variable 'redirect_url' can't be set to the value of 'https://mariadb.org' +set global redirect_url="mysql://mariadb.org:"; +ERROR 42000: Variable 'redirect_url' can't be set to the value of 'mysql://mariadb.org:' +set global redirect_url="mysql://mariadb.org:hello"; +ERROR 42000: Variable 'redirect_url' can't be set to the value of 'mysql://mariadb.org:hello' +set global redirect_url="mysql://"; +ERROR 42000: Variable 'redirect_url' can't be set to the value of 'mysql://' +set global redirect_url="mysql://mariadb.org"; +select @@global.redirect_url; +@@global.redirect_url +mysql://mariadb.org +set global redirect_url="mysql://mariadb.org:12a"; +ERROR 42000: Variable 'redirect_url' can't be set to the value of 'mysql://mariadb.org:12a' +set global redirect_url="mysql://mariadb.org:66666"; +ERROR 42000: Variable 'redirect_url' can't be set to the value of 'mysql://mariadb.org:66666' +set global redirect_url="mysql://mariadb.org:12345"; +select @@global.redirect_url; +@@global.redirect_url +mysql://mariadb.org:12345 +set global redirect_url="maria"; +ERROR 42000: Variable 'redirect_url' can't be set to the value of 'maria' +set global redirect_url="mariadb://mariadb.org:"; +ERROR 42000: Variable 'redirect_url' can't be set to the value of 'mariadb://mariadb.org:' +set global redirect_url="mariadb://mariadb.org:hello"; +ERROR 42000: Variable 'redirect_url' can't be set to the value of 'mariadb://mariadb.org:hello' +set global redirect_url="mariadb://"; +ERROR 42000: Variable 'redirect_url' can't be set to the value of 'mariadb://' +set global redirect_url="mariadb://mariadb.org"; +select @@global.redirect_url; +@@global.redirect_url +mariadb://mariadb.org +set global redirect_url="mariadb://mariadb.org:12a"; +ERROR 42000: Variable 'redirect_url' can't be set to the value of 'mariadb://mariadb.org:12a' +set global redirect_url="mariadb://mariadb.org:66666"; +ERROR 42000: Variable 'redirect_url' can't be set to the value of 'mariadb://mariadb.org:66666' +set global redirect_url="mariadb://mariadb.org:12345"; +select @@global.redirect_url; +@@global.redirect_url +mariadb://mariadb.org:12345 +select @@session.redirect_url; +@@session.redirect_url + +set session redirect_url=default; +select @@session.redirect_url; +@@session.redirect_url +mariadb://mariadb.org:12345 +set session redirect_url="mysql://localhost"; +select @@session.redirect_url; +@@session.redirect_url +mysql://localhost +select @@global.redirect_url; +@@global.redirect_url +mariadb://mariadb.org:12345 +set global redirect_url=@old_global_redirect_url; +set session redirect_url=@old_session_redirect_url; +set session session_track_system_variables=@old_session_track_system_variables; +# +# end of test MDEV-15935 +# diff --git a/mysql-test/suite/sys_vars/r/relay_log_purge_grant.result b/mysql-test/suite/sys_vars/r/relay_log_purge_grant.result index 0823bf1f..b22b86f2 100644 --- a/mysql-test/suite/sys_vars/r/relay_log_purge_grant.result +++ b/mysql-test/suite/sys_vars/r/relay_log_purge_grant.result @@ -2,14 +2,14 @@ # MDEV-21969 Bind REPLICATION SLAVE ADMIN to relay_log_*, sync_master_info, sync_relay_log, sync_relay_log_info # SET @global=@@global.relay_log_purge; -# Test that "SET relay_log_purge" is not allowed without REPLICATION SLAVE ADMIN or SUPER +# Test that "SET relay_log_purge" is not allowed without REPLICATION SLAVE ADMIN CREATE USER user1@localhost; GRANT ALL PRIVILEGES ON *.* TO user1@localhost; -REVOKE REPLICATION SLAVE ADMIN, SUPER ON *.* FROM user1@localhost; +REVOKE REPLICATION SLAVE ADMIN ON *.* FROM user1@localhost; connect user1,localhost,user1,,; connection user1; SET GLOBAL relay_log_purge=1; -ERROR 42000: Access denied; you need (at least one of) the SUPER, REPLICATION SLAVE ADMIN privilege(s) for this operation +ERROR 42000: Access denied; you need (at least one of) the REPLICATION SLAVE ADMIN privilege(s) for this operation SET relay_log_purge=1; ERROR HY000: Variable 'relay_log_purge' is a GLOBAL variable and should be set with SET GLOBAL SET SESSION relay_log_purge=1; @@ -30,17 +30,4 @@ ERROR HY000: Variable 'relay_log_purge' is a GLOBAL variable and should be set w disconnect user1; connection default; DROP USER user1@localhost; -# Test that "SET relay_log_purge" is allowed with SUPER -CREATE USER user1@localhost; -GRANT SUPER ON *.* TO user1@localhost; -connect user1,localhost,user1,,; -connection user1; -SET GLOBAL relay_log_purge=1; -SET relay_log_purge=1; -ERROR HY000: Variable 'relay_log_purge' is a GLOBAL variable and should be set with SET GLOBAL -SET SESSION relay_log_purge=1; -ERROR HY000: Variable 'relay_log_purge' is a GLOBAL variable and should be set with SET GLOBAL -disconnect user1; -connection default; -DROP USER user1@localhost; SET @@global.relay_log_purge=@global; diff --git a/mysql-test/suite/sys_vars/r/relay_log_recovery_grant.result b/mysql-test/suite/sys_vars/r/relay_log_recovery_grant.result index 9e90c99f..14e2ef0e 100644 --- a/mysql-test/suite/sys_vars/r/relay_log_recovery_grant.result +++ b/mysql-test/suite/sys_vars/r/relay_log_recovery_grant.result @@ -2,14 +2,14 @@ # MDEV-21969 Bind REPLICATION SLAVE ADMIN to relay_log_*, sync_master_info, sync_relay_log, sync_relay_log_info # SET @global=@@global.relay_log_recovery; -# Test that "SET relay_log_recovery" is not allowed without REPLICATION SLAVE ADMIN or SUPER +# Test that "SET relay_log_recovery" is not allowed without REPLICATION SLAVE ADMIN CREATE USER user1@localhost; GRANT ALL PRIVILEGES ON *.* TO user1@localhost; -REVOKE REPLICATION SLAVE ADMIN, SUPER ON *.* FROM user1@localhost; +REVOKE REPLICATION SLAVE ADMIN ON *.* FROM user1@localhost; connect user1,localhost,user1,,; connection user1; SET GLOBAL relay_log_recovery=1; -ERROR 42000: Access denied; you need (at least one of) the SUPER, REPLICATION SLAVE ADMIN privilege(s) for this operation +ERROR 42000: Access denied; you need (at least one of) the REPLICATION SLAVE ADMIN privilege(s) for this operation SET relay_log_recovery=1; ERROR HY000: Variable 'relay_log_recovery' is a GLOBAL variable and should be set with SET GLOBAL SET SESSION relay_log_recovery=1; @@ -30,17 +30,4 @@ ERROR HY000: Variable 'relay_log_recovery' is a GLOBAL variable and should be se disconnect user1; connection default; DROP USER user1@localhost; -# Test that "SET relay_log_recovery" is allowed with SUPER -CREATE USER user1@localhost; -GRANT SUPER ON *.* TO user1@localhost; -connect user1,localhost,user1,,; -connection user1; -SET GLOBAL relay_log_recovery=1; -SET relay_log_recovery=1; -ERROR HY000: Variable 'relay_log_recovery' is a GLOBAL variable and should be set with SET GLOBAL -SET SESSION relay_log_recovery=1; -ERROR HY000: Variable 'relay_log_recovery' is a GLOBAL variable and should be set with SET GLOBAL -disconnect user1; -connection default; -DROP USER user1@localhost; SET @@global.relay_log_recovery=@global; diff --git a/mysql-test/suite/sys_vars/r/replicate_do_db_grant.result b/mysql-test/suite/sys_vars/r/replicate_do_db_grant.result index 1f352590..e5418dd6 100644 --- a/mysql-test/suite/sys_vars/r/replicate_do_db_grant.result +++ b/mysql-test/suite/sys_vars/r/replicate_do_db_grant.result @@ -2,14 +2,14 @@ # MDEV-21966 Bind REPLICATION SLAVE ADMIN to a number of global system variables # SET @global=@@global.replicate_do_db; -# Test that "SET replicate_do_db" is not allowed without REPLICATION SLAVE ADMIN or SUPER +# Test that "SET replicate_do_db" is not allowed without REPLICATION SLAVE ADMIN CREATE USER user1@localhost; GRANT ALL PRIVILEGES ON *.* TO user1@localhost; -REVOKE REPLICATION SLAVE ADMIN, SUPER ON *.* FROM user1@localhost; +REVOKE REPLICATION SLAVE ADMIN ON *.* FROM user1@localhost; connect user1,localhost,user1,,; connection user1; SET GLOBAL replicate_do_db=''; -ERROR 42000: Access denied; you need (at least one of) the SUPER, REPLICATION SLAVE ADMIN privilege(s) for this operation +ERROR 42000: Access denied; you need (at least one of) the REPLICATION SLAVE ADMIN privilege(s) for this operation SET replicate_do_db=''; ERROR HY000: Variable 'replicate_do_db' is a GLOBAL variable and should be set with SET GLOBAL SET SESSION replicate_do_db=''; @@ -30,17 +30,4 @@ ERROR HY000: Variable 'replicate_do_db' is a GLOBAL variable and should be set w disconnect user1; connection default; DROP USER user1@localhost; -# Test that "SET replicate_do_db" is allowed with SUPER -CREATE USER user1@localhost; -GRANT SUPER ON *.* TO user1@localhost; -connect user1,localhost,user1,,; -connection user1; -SET GLOBAL replicate_do_db=''; -SET replicate_do_db=''; -ERROR HY000: Variable 'replicate_do_db' is a GLOBAL variable and should be set with SET GLOBAL -SET SESSION replicate_do_db=''; -ERROR HY000: Variable 'replicate_do_db' is a GLOBAL variable and should be set with SET GLOBAL -disconnect user1; -connection default; -DROP USER user1@localhost; SET @@global.replicate_do_db=@global; diff --git a/mysql-test/suite/sys_vars/r/replicate_do_table_grant.result b/mysql-test/suite/sys_vars/r/replicate_do_table_grant.result index 31290979..37b5450f 100644 --- a/mysql-test/suite/sys_vars/r/replicate_do_table_grant.result +++ b/mysql-test/suite/sys_vars/r/replicate_do_table_grant.result @@ -2,14 +2,14 @@ # MDEV-21966 Bind REPLICATION SLAVE ADMIN to a number of global system variables # SET @global=@@global.replicate_do_table; -# Test that "SET replicate_do_table" is not allowed without REPLICATION SLAVE ADMIN or SUPER +# Test that "SET replicate_do_table" is not allowed without REPLICATION SLAVE ADMIN CREATE USER user1@localhost; GRANT ALL PRIVILEGES ON *.* TO user1@localhost; -REVOKE REPLICATION SLAVE ADMIN, SUPER ON *.* FROM user1@localhost; +REVOKE REPLICATION SLAVE ADMIN ON *.* FROM user1@localhost; connect user1,localhost,user1,,; connection user1; SET GLOBAL replicate_do_table=''; -ERROR 42000: Access denied; you need (at least one of) the SUPER, REPLICATION SLAVE ADMIN privilege(s) for this operation +ERROR 42000: Access denied; you need (at least one of) the REPLICATION SLAVE ADMIN privilege(s) for this operation SET replicate_do_table=''; ERROR HY000: Variable 'replicate_do_table' is a GLOBAL variable and should be set with SET GLOBAL SET SESSION replicate_do_table=''; @@ -30,17 +30,4 @@ ERROR HY000: Variable 'replicate_do_table' is a GLOBAL variable and should be se disconnect user1; connection default; DROP USER user1@localhost; -# Test that "SET replicate_do_table" is allowed with SUPER -CREATE USER user1@localhost; -GRANT SUPER ON *.* TO user1@localhost; -connect user1,localhost,user1,,; -connection user1; -SET GLOBAL replicate_do_table=''; -SET replicate_do_table=''; -ERROR HY000: Variable 'replicate_do_table' is a GLOBAL variable and should be set with SET GLOBAL -SET SESSION replicate_do_table=''; -ERROR HY000: Variable 'replicate_do_table' is a GLOBAL variable and should be set with SET GLOBAL -disconnect user1; -connection default; -DROP USER user1@localhost; SET @@global.replicate_do_table=@global; diff --git a/mysql-test/suite/sys_vars/r/replicate_events_marked_for_skip_grant.result b/mysql-test/suite/sys_vars/r/replicate_events_marked_for_skip_grant.result index f649294f..250be74b 100644 --- a/mysql-test/suite/sys_vars/r/replicate_events_marked_for_skip_grant.result +++ b/mysql-test/suite/sys_vars/r/replicate_events_marked_for_skip_grant.result @@ -2,14 +2,14 @@ # MDEV-21966 Bind REPLICATION SLAVE ADMIN to a number of global system variables # SET @global=@@global.replicate_events_marked_for_skip; -# Test that "SET replicate_events_marked_for_skip" is not allowed without REPLICATION SLAVE ADMIN or SUPER +# Test that "SET replicate_events_marked_for_skip" is not allowed without REPLICATION SLAVE ADMIN CREATE USER user1@localhost; GRANT ALL PRIVILEGES ON *.* TO user1@localhost; -REVOKE REPLICATION SLAVE ADMIN, SUPER ON *.* FROM user1@localhost; +REVOKE REPLICATION SLAVE ADMIN ON *.* FROM user1@localhost; connect user1,localhost,user1,,; connection user1; SET GLOBAL replicate_events_marked_for_skip=REPLICATE; -ERROR 42000: Access denied; you need (at least one of) the SUPER, REPLICATION SLAVE ADMIN privilege(s) for this operation +ERROR 42000: Access denied; you need (at least one of) the REPLICATION SLAVE ADMIN privilege(s) for this operation SET replicate_events_marked_for_skip=REPLICATE; ERROR HY000: Variable 'replicate_events_marked_for_skip' is a GLOBAL variable and should be set with SET GLOBAL SET SESSION replicate_events_marked_for_skip=REPLICATE; @@ -30,17 +30,4 @@ ERROR HY000: Variable 'replicate_events_marked_for_skip' is a GLOBAL variable an disconnect user1; connection default; DROP USER user1@localhost; -# Test that "SET replicate_events_marked_for_skip" is allowed with SUPER -CREATE USER user1@localhost; -GRANT SUPER ON *.* TO user1@localhost; -connect user1,localhost,user1,,; -connection user1; -SET GLOBAL replicate_events_marked_for_skip=REPLICATE; -SET replicate_events_marked_for_skip=REPLICATE; -ERROR HY000: Variable 'replicate_events_marked_for_skip' is a GLOBAL variable and should be set with SET GLOBAL -SET SESSION replicate_events_marked_for_skip=REPLICATE; -ERROR HY000: Variable 'replicate_events_marked_for_skip' is a GLOBAL variable and should be set with SET GLOBAL -disconnect user1; -connection default; -DROP USER user1@localhost; SET @@global.replicate_events_marked_for_skip=@global; diff --git a/mysql-test/suite/sys_vars/r/replicate_ignore_db_grant.result b/mysql-test/suite/sys_vars/r/replicate_ignore_db_grant.result index 612fab62..6086f363 100644 --- a/mysql-test/suite/sys_vars/r/replicate_ignore_db_grant.result +++ b/mysql-test/suite/sys_vars/r/replicate_ignore_db_grant.result @@ -2,14 +2,14 @@ # MDEV-21966 Bind REPLICATION SLAVE ADMIN to a number of global system variables # SET @global=@@global.replicate_ignore_db; -# Test that "SET replicate_ignore_db" is not allowed without REPLICATION SLAVE ADMIN or SUPER +# Test that "SET replicate_ignore_db" is not allowed without REPLICATION SLAVE ADMIN CREATE USER user1@localhost; GRANT ALL PRIVILEGES ON *.* TO user1@localhost; -REVOKE REPLICATION SLAVE ADMIN, SUPER ON *.* FROM user1@localhost; +REVOKE REPLICATION SLAVE ADMIN ON *.* FROM user1@localhost; connect user1,localhost,user1,,; connection user1; SET GLOBAL replicate_ignore_db=''; -ERROR 42000: Access denied; you need (at least one of) the SUPER, REPLICATION SLAVE ADMIN privilege(s) for this operation +ERROR 42000: Access denied; you need (at least one of) the REPLICATION SLAVE ADMIN privilege(s) for this operation SET replicate_ignore_db=''; ERROR HY000: Variable 'replicate_ignore_db' is a GLOBAL variable and should be set with SET GLOBAL SET SESSION replicate_ignore_db=''; @@ -30,17 +30,4 @@ ERROR HY000: Variable 'replicate_ignore_db' is a GLOBAL variable and should be s disconnect user1; connection default; DROP USER user1@localhost; -# Test that "SET replicate_ignore_db" is allowed with SUPER -CREATE USER user1@localhost; -GRANT SUPER ON *.* TO user1@localhost; -connect user1,localhost,user1,,; -connection user1; -SET GLOBAL replicate_ignore_db=''; -SET replicate_ignore_db=''; -ERROR HY000: Variable 'replicate_ignore_db' is a GLOBAL variable and should be set with SET GLOBAL -SET SESSION replicate_ignore_db=''; -ERROR HY000: Variable 'replicate_ignore_db' is a GLOBAL variable and should be set with SET GLOBAL -disconnect user1; -connection default; -DROP USER user1@localhost; SET @@global.replicate_ignore_db=@global; diff --git a/mysql-test/suite/sys_vars/r/replicate_ignore_table_grant.result b/mysql-test/suite/sys_vars/r/replicate_ignore_table_grant.result index 9f2354a8..b2ff3384 100644 --- a/mysql-test/suite/sys_vars/r/replicate_ignore_table_grant.result +++ b/mysql-test/suite/sys_vars/r/replicate_ignore_table_grant.result @@ -2,14 +2,14 @@ # MDEV-21966 Bind REPLICATION SLAVE ADMIN to a number of global system variables # SET @global=@@global.replicate_ignore_table; -# Test that "SET replicate_ignore_table" is not allowed without REPLICATION SLAVE ADMIN or SUPER +# Test that "SET replicate_ignore_table" is not allowed without REPLICATION SLAVE ADMIN CREATE USER user1@localhost; GRANT ALL PRIVILEGES ON *.* TO user1@localhost; -REVOKE REPLICATION SLAVE ADMIN, SUPER ON *.* FROM user1@localhost; +REVOKE REPLICATION SLAVE ADMIN ON *.* FROM user1@localhost; connect user1,localhost,user1,,; connection user1; SET GLOBAL replicate_ignore_table=''; -ERROR 42000: Access denied; you need (at least one of) the SUPER, REPLICATION SLAVE ADMIN privilege(s) for this operation +ERROR 42000: Access denied; you need (at least one of) the REPLICATION SLAVE ADMIN privilege(s) for this operation SET replicate_ignore_table=''; ERROR HY000: Variable 'replicate_ignore_table' is a GLOBAL variable and should be set with SET GLOBAL SET SESSION replicate_ignore_table=''; @@ -30,17 +30,4 @@ ERROR HY000: Variable 'replicate_ignore_table' is a GLOBAL variable and should b disconnect user1; connection default; DROP USER user1@localhost; -# Test that "SET replicate_ignore_table" is allowed with SUPER -CREATE USER user1@localhost; -GRANT SUPER ON *.* TO user1@localhost; -connect user1,localhost,user1,,; -connection user1; -SET GLOBAL replicate_ignore_table=''; -SET replicate_ignore_table=''; -ERROR HY000: Variable 'replicate_ignore_table' is a GLOBAL variable and should be set with SET GLOBAL -SET SESSION replicate_ignore_table=''; -ERROR HY000: Variable 'replicate_ignore_table' is a GLOBAL variable and should be set with SET GLOBAL -disconnect user1; -connection default; -DROP USER user1@localhost; SET @@global.replicate_ignore_table=@global; diff --git a/mysql-test/suite/sys_vars/r/replicate_wild_do_table_grant.result b/mysql-test/suite/sys_vars/r/replicate_wild_do_table_grant.result index 1c9e12de..c09ef6ec 100644 --- a/mysql-test/suite/sys_vars/r/replicate_wild_do_table_grant.result +++ b/mysql-test/suite/sys_vars/r/replicate_wild_do_table_grant.result @@ -2,14 +2,14 @@ # MDEV-21966 Bind REPLICATION SLAVE ADMIN to a number of global system variables # SET @global=@@global.replicate_wild_do_table; -# Test that "SET replicate_wild_do_table" is not allowed without REPLICATION SLAVE ADMIN or SUPER +# Test that "SET replicate_wild_do_table" is not allowed without REPLICATION SLAVE ADMIN CREATE USER user1@localhost; GRANT ALL PRIVILEGES ON *.* TO user1@localhost; -REVOKE REPLICATION SLAVE ADMIN, SUPER ON *.* FROM user1@localhost; +REVOKE REPLICATION SLAVE ADMIN ON *.* FROM user1@localhost; connect user1,localhost,user1,,; connection user1; SET GLOBAL replicate_wild_do_table=''; -ERROR 42000: Access denied; you need (at least one of) the SUPER, REPLICATION SLAVE ADMIN privilege(s) for this operation +ERROR 42000: Access denied; you need (at least one of) the REPLICATION SLAVE ADMIN privilege(s) for this operation SET replicate_wild_do_table=''; ERROR HY000: Variable 'replicate_wild_do_table' is a GLOBAL variable and should be set with SET GLOBAL SET SESSION replicate_wild_do_table=''; @@ -30,17 +30,4 @@ ERROR HY000: Variable 'replicate_wild_do_table' is a GLOBAL variable and should disconnect user1; connection default; DROP USER user1@localhost; -# Test that "SET replicate_wild_do_table" is allowed with SUPER -CREATE USER user1@localhost; -GRANT SUPER ON *.* TO user1@localhost; -connect user1,localhost,user1,,; -connection user1; -SET GLOBAL replicate_wild_do_table=''; -SET replicate_wild_do_table=''; -ERROR HY000: Variable 'replicate_wild_do_table' is a GLOBAL variable and should be set with SET GLOBAL -SET SESSION replicate_wild_do_table=''; -ERROR HY000: Variable 'replicate_wild_do_table' is a GLOBAL variable and should be set with SET GLOBAL -disconnect user1; -connection default; -DROP USER user1@localhost; SET @@global.replicate_wild_do_table=@global; diff --git a/mysql-test/suite/sys_vars/r/replicate_wild_ignore_table_grant.result b/mysql-test/suite/sys_vars/r/replicate_wild_ignore_table_grant.result index 27a82173..2f5998e1 100644 --- a/mysql-test/suite/sys_vars/r/replicate_wild_ignore_table_grant.result +++ b/mysql-test/suite/sys_vars/r/replicate_wild_ignore_table_grant.result @@ -2,14 +2,14 @@ # MDEV-21966 Bind REPLICATION SLAVE ADMIN to a number of global system variables # SET @global=@@global.replicate_wild_ignore_table; -# Test that "SET replicate_wild_ignore_table" is not allowed without REPLICATION SLAVE ADMIN or SUPER +# Test that "SET replicate_wild_ignore_table" is not allowed without REPLICATION SLAVE ADMIN CREATE USER user1@localhost; GRANT ALL PRIVILEGES ON *.* TO user1@localhost; -REVOKE REPLICATION SLAVE ADMIN, SUPER ON *.* FROM user1@localhost; +REVOKE REPLICATION SLAVE ADMIN ON *.* FROM user1@localhost; connect user1,localhost,user1,,; connection user1; SET GLOBAL replicate_wild_ignore_table=''; -ERROR 42000: Access denied; you need (at least one of) the SUPER, REPLICATION SLAVE ADMIN privilege(s) for this operation +ERROR 42000: Access denied; you need (at least one of) the REPLICATION SLAVE ADMIN privilege(s) for this operation SET replicate_wild_ignore_table=''; ERROR HY000: Variable 'replicate_wild_ignore_table' is a GLOBAL variable and should be set with SET GLOBAL SET SESSION replicate_wild_ignore_table=''; @@ -30,17 +30,4 @@ ERROR HY000: Variable 'replicate_wild_ignore_table' is a GLOBAL variable and sho disconnect user1; connection default; DROP USER user1@localhost; -# Test that "SET replicate_wild_ignore_table" is allowed with SUPER -CREATE USER user1@localhost; -GRANT SUPER ON *.* TO user1@localhost; -connect user1,localhost,user1,,; -connection user1; -SET GLOBAL replicate_wild_ignore_table=''; -SET replicate_wild_ignore_table=''; -ERROR HY000: Variable 'replicate_wild_ignore_table' is a GLOBAL variable and should be set with SET GLOBAL -SET SESSION replicate_wild_ignore_table=''; -ERROR HY000: Variable 'replicate_wild_ignore_table' is a GLOBAL variable and should be set with SET GLOBAL -disconnect user1; -connection default; -DROP USER user1@localhost; SET @@global.replicate_wild_ignore_table=@global; diff --git a/mysql-test/suite/sys_vars/r/rpl_semi_sync_master_enabled_grant.result b/mysql-test/suite/sys_vars/r/rpl_semi_sync_master_enabled_grant.result index 3c5b3d07..803a5551 100644 --- a/mysql-test/suite/sys_vars/r/rpl_semi_sync_master_enabled_grant.result +++ b/mysql-test/suite/sys_vars/r/rpl_semi_sync_master_enabled_grant.result @@ -2,14 +2,14 @@ # MDEV-21967 Bind REPLICATION {MASTER|SLAVE} ADMIN to rpl_semi_sync_* variables # SET @global=@@global.rpl_semi_sync_master_enabled; -# Test that "SET rpl_semi_sync_master_enabled" is not allowed without REPLICATION MASTER ADMIN or SUPER +# Test that "SET rpl_semi_sync_master_enabled" is not allowed without REPLICATION MASTER ADMIN CREATE USER user1@localhost; GRANT ALL PRIVILEGES ON *.* TO user1@localhost; -REVOKE REPLICATION MASTER ADMIN, SUPER ON *.* FROM user1@localhost; +REVOKE REPLICATION MASTER ADMIN ON *.* FROM user1@localhost; connect user1,localhost,user1,,; connection user1; SET GLOBAL rpl_semi_sync_master_enabled=1; -ERROR 42000: Access denied; you need (at least one of) the SUPER, REPLICATION MASTER ADMIN privilege(s) for this operation +ERROR 42000: Access denied; you need (at least one of) the REPLICATION MASTER ADMIN privilege(s) for this operation SET rpl_semi_sync_master_enabled=1; ERROR HY000: Variable 'rpl_semi_sync_master_enabled' is a GLOBAL variable and should be set with SET GLOBAL SET SESSION rpl_semi_sync_master_enabled=1; @@ -30,17 +30,4 @@ ERROR HY000: Variable 'rpl_semi_sync_master_enabled' is a GLOBAL variable and sh disconnect user1; connection default; DROP USER user1@localhost; -# Test that "SET rpl_semi_sync_master_enabled" is allowed with SUPER -CREATE USER user1@localhost; -GRANT SUPER ON *.* TO user1@localhost; -connect user1,localhost,user1,,; -connection user1; -SET GLOBAL rpl_semi_sync_master_enabled=1; -SET rpl_semi_sync_master_enabled=1; -ERROR HY000: Variable 'rpl_semi_sync_master_enabled' is a GLOBAL variable and should be set with SET GLOBAL -SET SESSION rpl_semi_sync_master_enabled=1; -ERROR HY000: Variable 'rpl_semi_sync_master_enabled' is a GLOBAL variable and should be set with SET GLOBAL -disconnect user1; -connection default; -DROP USER user1@localhost; SET @@global.rpl_semi_sync_master_enabled=@global; diff --git a/mysql-test/suite/sys_vars/r/rpl_semi_sync_master_timeout_grant.result b/mysql-test/suite/sys_vars/r/rpl_semi_sync_master_timeout_grant.result index 2e8b51d5..be12c0ff 100644 --- a/mysql-test/suite/sys_vars/r/rpl_semi_sync_master_timeout_grant.result +++ b/mysql-test/suite/sys_vars/r/rpl_semi_sync_master_timeout_grant.result @@ -2,14 +2,14 @@ # MDEV-21967 Bind REPLICATION {MASTER|SLAVE} ADMIN to rpl_semi_sync_* variables # SET @global=@@global.rpl_semi_sync_master_timeout; -# Test that "SET rpl_semi_sync_master_timeout" is not allowed without REPLICATION MASTER ADMIN or SUPER +# Test that "SET rpl_semi_sync_master_timeout" is not allowed without REPLICATION MASTER ADMIN CREATE USER user1@localhost; GRANT ALL PRIVILEGES ON *.* TO user1@localhost; -REVOKE REPLICATION MASTER ADMIN, SUPER ON *.* FROM user1@localhost; +REVOKE REPLICATION MASTER ADMIN ON *.* FROM user1@localhost; connect user1,localhost,user1,,; connection user1; SET GLOBAL rpl_semi_sync_master_timeout=20000; -ERROR 42000: Access denied; you need (at least one of) the SUPER, REPLICATION MASTER ADMIN privilege(s) for this operation +ERROR 42000: Access denied; you need (at least one of) the REPLICATION MASTER ADMIN privilege(s) for this operation SET rpl_semi_sync_master_timeout=20000; ERROR HY000: Variable 'rpl_semi_sync_master_timeout' is a GLOBAL variable and should be set with SET GLOBAL SET SESSION rpl_semi_sync_master_timeout=20000; @@ -30,17 +30,4 @@ ERROR HY000: Variable 'rpl_semi_sync_master_timeout' is a GLOBAL variable and sh disconnect user1; connection default; DROP USER user1@localhost; -# Test that "SET rpl_semi_sync_master_timeout" is allowed with SUPER -CREATE USER user1@localhost; -GRANT SUPER ON *.* TO user1@localhost; -connect user1,localhost,user1,,; -connection user1; -SET GLOBAL rpl_semi_sync_master_timeout=20000; -SET rpl_semi_sync_master_timeout=20000; -ERROR HY000: Variable 'rpl_semi_sync_master_timeout' is a GLOBAL variable and should be set with SET GLOBAL -SET SESSION rpl_semi_sync_master_timeout=20000; -ERROR HY000: Variable 'rpl_semi_sync_master_timeout' is a GLOBAL variable and should be set with SET GLOBAL -disconnect user1; -connection default; -DROP USER user1@localhost; SET @@global.rpl_semi_sync_master_timeout=@global; diff --git a/mysql-test/suite/sys_vars/r/rpl_semi_sync_master_trace_level_grant.result b/mysql-test/suite/sys_vars/r/rpl_semi_sync_master_trace_level_grant.result index c31d063f..2c5a7e65 100644 --- a/mysql-test/suite/sys_vars/r/rpl_semi_sync_master_trace_level_grant.result +++ b/mysql-test/suite/sys_vars/r/rpl_semi_sync_master_trace_level_grant.result @@ -2,14 +2,14 @@ # MDEV-21967 Bind REPLICATION {MASTER|SLAVE} ADMIN to rpl_semi_sync_* variables # SET @global=@@global.rpl_semi_sync_master_trace_level; -# Test that "SET rpl_semi_sync_master_trace_level" is not allowed without REPLICATION MASTER ADMIN or SUPER +# Test that "SET rpl_semi_sync_master_trace_level" is not allowed without REPLICATION MASTER ADMIN CREATE USER user1@localhost; GRANT ALL PRIVILEGES ON *.* TO user1@localhost; -REVOKE REPLICATION MASTER ADMIN, SUPER ON *.* FROM user1@localhost; +REVOKE REPLICATION MASTER ADMIN ON *.* FROM user1@localhost; connect user1,localhost,user1,,; connection user1; SET GLOBAL rpl_semi_sync_master_trace_level=64; -ERROR 42000: Access denied; you need (at least one of) the SUPER, REPLICATION MASTER ADMIN privilege(s) for this operation +ERROR 42000: Access denied; you need (at least one of) the REPLICATION MASTER ADMIN privilege(s) for this operation SET rpl_semi_sync_master_trace_level=64; ERROR HY000: Variable 'rpl_semi_sync_master_trace_level' is a GLOBAL variable and should be set with SET GLOBAL SET SESSION rpl_semi_sync_master_trace_level=64; @@ -30,17 +30,4 @@ ERROR HY000: Variable 'rpl_semi_sync_master_trace_level' is a GLOBAL variable an disconnect user1; connection default; DROP USER user1@localhost; -# Test that "SET rpl_semi_sync_master_trace_level" is allowed with SUPER -CREATE USER user1@localhost; -GRANT SUPER ON *.* TO user1@localhost; -connect user1,localhost,user1,,; -connection user1; -SET GLOBAL rpl_semi_sync_master_trace_level=64; -SET rpl_semi_sync_master_trace_level=64; -ERROR HY000: Variable 'rpl_semi_sync_master_trace_level' is a GLOBAL variable and should be set with SET GLOBAL -SET SESSION rpl_semi_sync_master_trace_level=64; -ERROR HY000: Variable 'rpl_semi_sync_master_trace_level' is a GLOBAL variable and should be set with SET GLOBAL -disconnect user1; -connection default; -DROP USER user1@localhost; SET @@global.rpl_semi_sync_master_trace_level=@global; diff --git a/mysql-test/suite/sys_vars/r/rpl_semi_sync_master_wait_no_slave_grant.result b/mysql-test/suite/sys_vars/r/rpl_semi_sync_master_wait_no_slave_grant.result index 14e239f7..7af4016a 100644 --- a/mysql-test/suite/sys_vars/r/rpl_semi_sync_master_wait_no_slave_grant.result +++ b/mysql-test/suite/sys_vars/r/rpl_semi_sync_master_wait_no_slave_grant.result @@ -2,14 +2,14 @@ # MDEV-21967 Bind REPLICATION {MASTER|SLAVE} ADMIN to rpl_semi_sync_* variables # SET @global=@@global.rpl_semi_sync_master_wait_no_slave; -# Test that "SET rpl_semi_sync_master_wait_no_slave" is not allowed without REPLICATION MASTER ADMIN or SUPER +# Test that "SET rpl_semi_sync_master_wait_no_slave" is not allowed without REPLICATION MASTER ADMIN CREATE USER user1@localhost; GRANT ALL PRIVILEGES ON *.* TO user1@localhost; -REVOKE REPLICATION MASTER ADMIN, SUPER ON *.* FROM user1@localhost; +REVOKE REPLICATION MASTER ADMIN ON *.* FROM user1@localhost; connect user1,localhost,user1,,; connection user1; SET GLOBAL rpl_semi_sync_master_wait_no_slave=1; -ERROR 42000: Access denied; you need (at least one of) the SUPER, REPLICATION MASTER ADMIN privilege(s) for this operation +ERROR 42000: Access denied; you need (at least one of) the REPLICATION MASTER ADMIN privilege(s) for this operation SET rpl_semi_sync_master_wait_no_slave=1; ERROR HY000: Variable 'rpl_semi_sync_master_wait_no_slave' is a GLOBAL variable and should be set with SET GLOBAL SET SESSION rpl_semi_sync_master_wait_no_slave=1; @@ -30,17 +30,4 @@ ERROR HY000: Variable 'rpl_semi_sync_master_wait_no_slave' is a GLOBAL variable disconnect user1; connection default; DROP USER user1@localhost; -# Test that "SET rpl_semi_sync_master_wait_no_slave" is allowed with SUPER -CREATE USER user1@localhost; -GRANT SUPER ON *.* TO user1@localhost; -connect user1,localhost,user1,,; -connection user1; -SET GLOBAL rpl_semi_sync_master_wait_no_slave=1; -SET rpl_semi_sync_master_wait_no_slave=1; -ERROR HY000: Variable 'rpl_semi_sync_master_wait_no_slave' is a GLOBAL variable and should be set with SET GLOBAL -SET SESSION rpl_semi_sync_master_wait_no_slave=1; -ERROR HY000: Variable 'rpl_semi_sync_master_wait_no_slave' is a GLOBAL variable and should be set with SET GLOBAL -disconnect user1; -connection default; -DROP USER user1@localhost; SET @@global.rpl_semi_sync_master_wait_no_slave=@global; diff --git a/mysql-test/suite/sys_vars/r/rpl_semi_sync_master_wait_point_grant.result b/mysql-test/suite/sys_vars/r/rpl_semi_sync_master_wait_point_grant.result index 5760c459..0ce01cdb 100644 --- a/mysql-test/suite/sys_vars/r/rpl_semi_sync_master_wait_point_grant.result +++ b/mysql-test/suite/sys_vars/r/rpl_semi_sync_master_wait_point_grant.result @@ -2,14 +2,14 @@ # MDEV-21967 Bind REPLICATION {MASTER|SLAVE} ADMIN to rpl_semi_sync_* variables # SET @global=@@global.rpl_semi_sync_master_wait_point; -# Test that "SET rpl_semi_sync_master_wait_point" is not allowed without REPLICATION MASTER ADMIN or SUPER +# Test that "SET rpl_semi_sync_master_wait_point" is not allowed without REPLICATION MASTER ADMIN CREATE USER user1@localhost; GRANT ALL PRIVILEGES ON *.* TO user1@localhost; -REVOKE REPLICATION MASTER ADMIN, SUPER ON *.* FROM user1@localhost; +REVOKE REPLICATION MASTER ADMIN ON *.* FROM user1@localhost; connect user1,localhost,user1,,; connection user1; SET GLOBAL rpl_semi_sync_master_wait_point=AFTER_SYNC; -ERROR 42000: Access denied; you need (at least one of) the SUPER, REPLICATION MASTER ADMIN privilege(s) for this operation +ERROR 42000: Access denied; you need (at least one of) the REPLICATION MASTER ADMIN privilege(s) for this operation SET rpl_semi_sync_master_wait_point=AFTER_SYNC; ERROR HY000: Variable 'rpl_semi_sync_master_wait_point' is a GLOBAL variable and should be set with SET GLOBAL SET SESSION rpl_semi_sync_master_wait_point=AFTER_SYNC; @@ -30,17 +30,4 @@ ERROR HY000: Variable 'rpl_semi_sync_master_wait_point' is a GLOBAL variable and disconnect user1; connection default; DROP USER user1@localhost; -# Test that "SET rpl_semi_sync_master_wait_point" is allowed with SUPER -CREATE USER user1@localhost; -GRANT SUPER ON *.* TO user1@localhost; -connect user1,localhost,user1,,; -connection user1; -SET GLOBAL rpl_semi_sync_master_wait_point=AFTER_SYNC; -SET rpl_semi_sync_master_wait_point=AFTER_SYNC; -ERROR HY000: Variable 'rpl_semi_sync_master_wait_point' is a GLOBAL variable and should be set with SET GLOBAL -SET SESSION rpl_semi_sync_master_wait_point=AFTER_SYNC; -ERROR HY000: Variable 'rpl_semi_sync_master_wait_point' is a GLOBAL variable and should be set with SET GLOBAL -disconnect user1; -connection default; -DROP USER user1@localhost; SET @@global.rpl_semi_sync_master_wait_point=@global; diff --git a/mysql-test/suite/sys_vars/r/rpl_semi_sync_slave_delay_master_grant.result b/mysql-test/suite/sys_vars/r/rpl_semi_sync_slave_delay_master_grant.result index 9e1c3073..9460df95 100644 --- a/mysql-test/suite/sys_vars/r/rpl_semi_sync_slave_delay_master_grant.result +++ b/mysql-test/suite/sys_vars/r/rpl_semi_sync_slave_delay_master_grant.result @@ -2,14 +2,14 @@ # MDEV-21967 Bind REPLICATION {MASTER|SLAVE} ADMIN to rpl_semi_sync_* variables # SET @global=@@global.rpl_semi_sync_slave_delay_master; -# Test that "SET rpl_semi_sync_slave_delay_master" is not allowed without REPLICATION SLAVE ADMIN or SUPER +# Test that "SET rpl_semi_sync_slave_delay_master" is not allowed without REPLICATION SLAVE ADMIN CREATE USER user1@localhost; GRANT ALL PRIVILEGES ON *.* TO user1@localhost; -REVOKE REPLICATION SLAVE ADMIN, SUPER ON *.* FROM user1@localhost; +REVOKE REPLICATION SLAVE ADMIN ON *.* FROM user1@localhost; connect user1,localhost,user1,,; connection user1; SET GLOBAL rpl_semi_sync_slave_delay_master=1; -ERROR 42000: Access denied; you need (at least one of) the SUPER, REPLICATION SLAVE ADMIN privilege(s) for this operation +ERROR 42000: Access denied; you need (at least one of) the REPLICATION SLAVE ADMIN privilege(s) for this operation SET rpl_semi_sync_slave_delay_master=1; ERROR HY000: Variable 'rpl_semi_sync_slave_delay_master' is a GLOBAL variable and should be set with SET GLOBAL SET SESSION rpl_semi_sync_slave_delay_master=1; @@ -30,17 +30,4 @@ ERROR HY000: Variable 'rpl_semi_sync_slave_delay_master' is a GLOBAL variable an disconnect user1; connection default; DROP USER user1@localhost; -# Test that "SET rpl_semi_sync_slave_delay_master" is allowed with SUPER -CREATE USER user1@localhost; -GRANT SUPER ON *.* TO user1@localhost; -connect user1,localhost,user1,,; -connection user1; -SET GLOBAL rpl_semi_sync_slave_delay_master=1; -SET rpl_semi_sync_slave_delay_master=1; -ERROR HY000: Variable 'rpl_semi_sync_slave_delay_master' is a GLOBAL variable and should be set with SET GLOBAL -SET SESSION rpl_semi_sync_slave_delay_master=1; -ERROR HY000: Variable 'rpl_semi_sync_slave_delay_master' is a GLOBAL variable and should be set with SET GLOBAL -disconnect user1; -connection default; -DROP USER user1@localhost; SET @@global.rpl_semi_sync_slave_delay_master=@global; diff --git a/mysql-test/suite/sys_vars/r/rpl_semi_sync_slave_enabled_grant.result b/mysql-test/suite/sys_vars/r/rpl_semi_sync_slave_enabled_grant.result index f370b82d..f99eee16 100644 --- a/mysql-test/suite/sys_vars/r/rpl_semi_sync_slave_enabled_grant.result +++ b/mysql-test/suite/sys_vars/r/rpl_semi_sync_slave_enabled_grant.result @@ -2,14 +2,14 @@ # MDEV-21967 Bind REPLICATION {MASTER|SLAVE} ADMIN to rpl_semi_sync_* variables # SET @global=@@global.rpl_semi_sync_slave_enabled; -# Test that "SET rpl_semi_sync_slave_enabled" is not allowed without REPLICATION SLAVE ADMIN or SUPER +# Test that "SET rpl_semi_sync_slave_enabled" is not allowed without REPLICATION SLAVE ADMIN CREATE USER user1@localhost; GRANT ALL PRIVILEGES ON *.* TO user1@localhost; -REVOKE REPLICATION SLAVE ADMIN, SUPER ON *.* FROM user1@localhost; +REVOKE REPLICATION SLAVE ADMIN ON *.* FROM user1@localhost; connect user1,localhost,user1,,; connection user1; SET GLOBAL rpl_semi_sync_slave_enabled=1; -ERROR 42000: Access denied; you need (at least one of) the SUPER, REPLICATION SLAVE ADMIN privilege(s) for this operation +ERROR 42000: Access denied; you need (at least one of) the REPLICATION SLAVE ADMIN privilege(s) for this operation SET rpl_semi_sync_slave_enabled=1; ERROR HY000: Variable 'rpl_semi_sync_slave_enabled' is a GLOBAL variable and should be set with SET GLOBAL SET SESSION rpl_semi_sync_slave_enabled=1; @@ -30,17 +30,4 @@ ERROR HY000: Variable 'rpl_semi_sync_slave_enabled' is a GLOBAL variable and sho disconnect user1; connection default; DROP USER user1@localhost; -# Test that "SET rpl_semi_sync_slave_enabled" is allowed with SUPER -CREATE USER user1@localhost; -GRANT SUPER ON *.* TO user1@localhost; -connect user1,localhost,user1,,; -connection user1; -SET GLOBAL rpl_semi_sync_slave_enabled=1; -SET rpl_semi_sync_slave_enabled=1; -ERROR HY000: Variable 'rpl_semi_sync_slave_enabled' is a GLOBAL variable and should be set with SET GLOBAL -SET SESSION rpl_semi_sync_slave_enabled=1; -ERROR HY000: Variable 'rpl_semi_sync_slave_enabled' is a GLOBAL variable and should be set with SET GLOBAL -disconnect user1; -connection default; -DROP USER user1@localhost; SET @@global.rpl_semi_sync_slave_enabled=@global; diff --git a/mysql-test/suite/sys_vars/r/rpl_semi_sync_slave_kill_conn_timeout_grant.result b/mysql-test/suite/sys_vars/r/rpl_semi_sync_slave_kill_conn_timeout_grant.result index f5e0f3b3..42eda805 100644 --- a/mysql-test/suite/sys_vars/r/rpl_semi_sync_slave_kill_conn_timeout_grant.result +++ b/mysql-test/suite/sys_vars/r/rpl_semi_sync_slave_kill_conn_timeout_grant.result @@ -2,14 +2,14 @@ # MDEV-21967 Bind REPLICATION {MASTER|SLAVE} ADMIN to rpl_semi_sync_* variables # SET @global=@@global.rpl_semi_sync_slave_kill_conn_timeout; -# Test that "SET rpl_semi_sync_slave_kill_conn_timeout" is not allowed without REPLICATION SLAVE ADMIN or SUPER +# Test that "SET rpl_semi_sync_slave_kill_conn_timeout" is not allowed without REPLICATION SLAVE ADMIN CREATE USER user1@localhost; GRANT ALL PRIVILEGES ON *.* TO user1@localhost; -REVOKE REPLICATION SLAVE ADMIN, SUPER ON *.* FROM user1@localhost; +REVOKE REPLICATION SLAVE ADMIN ON *.* FROM user1@localhost; connect user1,localhost,user1,,; connection user1; SET GLOBAL rpl_semi_sync_slave_kill_conn_timeout=1; -ERROR 42000: Access denied; you need (at least one of) the SUPER, REPLICATION SLAVE ADMIN privilege(s) for this operation +ERROR 42000: Access denied; you need (at least one of) the REPLICATION SLAVE ADMIN privilege(s) for this operation SET rpl_semi_sync_slave_kill_conn_timeout=1; ERROR HY000: Variable 'rpl_semi_sync_slave_kill_conn_timeout' is a GLOBAL variable and should be set with SET GLOBAL SET SESSION rpl_semi_sync_slave_kill_conn_timeout=1; @@ -30,17 +30,4 @@ ERROR HY000: Variable 'rpl_semi_sync_slave_kill_conn_timeout' is a GLOBAL variab disconnect user1; connection default; DROP USER user1@localhost; -# Test that "SET rpl_semi_sync_slave_kill_conn_timeout" is allowed with SUPER -CREATE USER user1@localhost; -GRANT SUPER ON *.* TO user1@localhost; -connect user1,localhost,user1,,; -connection user1; -SET GLOBAL rpl_semi_sync_slave_kill_conn_timeout=1; -SET rpl_semi_sync_slave_kill_conn_timeout=1; -ERROR HY000: Variable 'rpl_semi_sync_slave_kill_conn_timeout' is a GLOBAL variable and should be set with SET GLOBAL -SET SESSION rpl_semi_sync_slave_kill_conn_timeout=1; -ERROR HY000: Variable 'rpl_semi_sync_slave_kill_conn_timeout' is a GLOBAL variable and should be set with SET GLOBAL -disconnect user1; -connection default; -DROP USER user1@localhost; SET @@global.rpl_semi_sync_slave_kill_conn_timeout=@global; diff --git a/mysql-test/suite/sys_vars/r/rpl_semi_sync_slave_trace_level_grant.result b/mysql-test/suite/sys_vars/r/rpl_semi_sync_slave_trace_level_grant.result index a1471906..9693731d 100644 --- a/mysql-test/suite/sys_vars/r/rpl_semi_sync_slave_trace_level_grant.result +++ b/mysql-test/suite/sys_vars/r/rpl_semi_sync_slave_trace_level_grant.result @@ -2,14 +2,14 @@ # MDEV-21967 Bind REPLICATION {MASTER|SLAVE} ADMIN to rpl_semi_sync_* variables # SET @global=@@global.rpl_semi_sync_slave_trace_level; -# Test that "SET rpl_semi_sync_slave_trace_level" is not allowed without REPLICATION SLAVE ADMIN or SUPER +# Test that "SET rpl_semi_sync_slave_trace_level" is not allowed without REPLICATION SLAVE ADMIN CREATE USER user1@localhost; GRANT ALL PRIVILEGES ON *.* TO user1@localhost; -REVOKE REPLICATION SLAVE ADMIN, SUPER ON *.* FROM user1@localhost; +REVOKE REPLICATION SLAVE ADMIN ON *.* FROM user1@localhost; connect user1,localhost,user1,,; connection user1; SET GLOBAL rpl_semi_sync_slave_trace_level=64; -ERROR 42000: Access denied; you need (at least one of) the SUPER, REPLICATION SLAVE ADMIN privilege(s) for this operation +ERROR 42000: Access denied; you need (at least one of) the REPLICATION SLAVE ADMIN privilege(s) for this operation SET rpl_semi_sync_slave_trace_level=64; ERROR HY000: Variable 'rpl_semi_sync_slave_trace_level' is a GLOBAL variable and should be set with SET GLOBAL SET SESSION rpl_semi_sync_slave_trace_level=64; @@ -30,17 +30,4 @@ ERROR HY000: Variable 'rpl_semi_sync_slave_trace_level' is a GLOBAL variable and disconnect user1; connection default; DROP USER user1@localhost; -# Test that "SET rpl_semi_sync_slave_trace_level" is allowed with SUPER -CREATE USER user1@localhost; -GRANT SUPER ON *.* TO user1@localhost; -connect user1,localhost,user1,,; -connection user1; -SET GLOBAL rpl_semi_sync_slave_trace_level=64; -SET rpl_semi_sync_slave_trace_level=64; -ERROR HY000: Variable 'rpl_semi_sync_slave_trace_level' is a GLOBAL variable and should be set with SET GLOBAL -SET SESSION rpl_semi_sync_slave_trace_level=64; -ERROR HY000: Variable 'rpl_semi_sync_slave_trace_level' is a GLOBAL variable and should be set with SET GLOBAL -disconnect user1; -connection default; -DROP USER user1@localhost; SET @@global.rpl_semi_sync_slave_trace_level=@global; diff --git a/mysql-test/suite/sys_vars/r/secure_auth_func.result b/mysql-test/suite/sys_vars/r/secure_auth_func.result index ee0d6146..30885dcb 100644 --- a/mysql-test/suite/sys_vars/r/secure_auth_func.result +++ b/mysql-test/suite/sys_vars/r/secure_auth_func.result @@ -14,7 +14,7 @@ CREATE USER 'testUser'@'localhost' IDENTIFIED BY 'newpass'; connect con_user1,localhost,testUser,newpass,; connection default; SET PASSWORD FOR 'testUser'@'localhost' = OLD_PASSWORD('newpass'); -connect con_user2,localhost,testUser,newpass,; +connect con_user2,localhost,testUser,newpass,,,,auth=mysql_old_password:mysql_native_password; connection default; '#--------------------FN_DYNVARS_144_03-------------------------#' SET GLOBAL secure_auth = ON; diff --git a/mysql-test/suite/sys_vars/r/secure_auth_grant.result b/mysql-test/suite/sys_vars/r/secure_auth_grant.result index ea4b1b09..18174d77 100644 --- a/mysql-test/suite/sys_vars/r/secure_auth_grant.result +++ b/mysql-test/suite/sys_vars/r/secure_auth_grant.result @@ -2,14 +2,14 @@ SET @global=@@global.secure_auth; # # MDEV-21961 Bind CONNECTION ADMIN to a number of global system variables # -# Test that "SET secure_auth" is not allowed without CONNECTION ADMIN or SUPER +# Test that "SET secure_auth" is not allowed without CONNECTION ADMIN CREATE USER user1@localhost; GRANT ALL PRIVILEGES ON *.* TO user1@localhost; -REVOKE CONNECTION ADMIN, SUPER ON *.* FROM user1@localhost; +REVOKE CONNECTION ADMIN ON *.* FROM user1@localhost; connect user1,localhost,user1,,; connection user1; SET GLOBAL secure_auth=1; -ERROR 42000: Access denied; you need (at least one of) the SUPER, CONNECTION ADMIN privilege(s) for this operation +ERROR 42000: Access denied; you need (at least one of) the CONNECTION ADMIN privilege(s) for this operation SET secure_auth=1; ERROR HY000: Variable 'secure_auth' is a GLOBAL variable and should be set with SET GLOBAL SET SESSION secure_auth=1; @@ -32,21 +32,6 @@ ERROR HY000: Variable 'secure_auth' is a GLOBAL variable and should be set with disconnect user1; connection default; DROP USER user1@localhost; -# Test that "SET secure_auth" is allowed with SUPER -CREATE USER user1@localhost; -GRANT SUPER ON *.* TO user1@localhost; -connect user1,localhost,user1,,; -connection user1; -SET GLOBAL secure_auth=1; -Warnings: -Warning 1287 '@@secure_auth' is deprecated and will be removed in a future release -SET secure_auth=1; -ERROR HY000: Variable 'secure_auth' is a GLOBAL variable and should be set with SET GLOBAL -SET SESSION secure_auth=1; -ERROR HY000: Variable 'secure_auth' is a GLOBAL variable and should be set with SET GLOBAL -disconnect user1; -connection default; -DROP USER user1@localhost; SET @@global.secure_auth=@global; Warnings: Warning 1287 '@@secure_auth' is deprecated and will be removed in a future release diff --git a/mysql-test/suite/sys_vars/r/secure_file_priv.result b/mysql-test/suite/sys_vars/r/secure_file_priv.result index 74f816df..eeeb9a58 100644 --- a/mysql-test/suite/sys_vars/r/secure_file_priv.result +++ b/mysql-test/suite/sys_vars/r/secure_file_priv.result @@ -6,8 +6,6 @@ INSERT INTO t1 VALUES ("one"),("two"),("three"),("four"),("five"); SHOW VARIABLES LIKE 'secure_file_priv'; Variable_name Value secure_file_priv -Warnings: -Warning 1287 '<select expression> INTO <destination>;' is deprecated and will be removed in a future release. Please use 'SELECT <select list> INTO <destination> FROM...' instead c1 one two diff --git a/mysql-test/suite/sys_vars/r/server_id_grant.result b/mysql-test/suite/sys_vars/r/server_id_grant.result index f562560e..444c1a56 100644 --- a/mysql-test/suite/sys_vars/r/server_id_grant.result +++ b/mysql-test/suite/sys_vars/r/server_id_grant.result @@ -2,14 +2,14 @@ # MDEV-21975 Add BINLOG REPLAY privilege and bind new privileges to gtid_seq_no, preudo_thread_id, server_id, gtid_domain_id # SET @global=@@global.server_id; -# Test that "SET GLOBAL server_id" is not allowed without REPLICATION MASTER ADMIN or SUPER +# Test that "SET GLOBAL server_id" is not allowed without REPLICATION MASTER ADMIN CREATE USER user1@localhost; GRANT ALL PRIVILEGES ON *.* TO user1@localhost; -REVOKE REPLICATION MASTER ADMIN, SUPER ON *.* FROM user1@localhost; +REVOKE REPLICATION MASTER ADMIN ON *.* FROM user1@localhost; connect user1,localhost,user1,,; connection user1; SET GLOBAL server_id=1; -ERROR 42000: Access denied; you need (at least one of) the SUPER, REPLICATION MASTER ADMIN privilege(s) for this operation +ERROR 42000: Access denied; you need (at least one of) the REPLICATION MASTER ADMIN privilege(s) for this operation disconnect user1; connection default; DROP USER user1@localhost; @@ -22,27 +22,18 @@ SET GLOBAL server_id=1; disconnect user1; connection default; DROP USER user1@localhost; -# Test that "SET GLOBAL server_id" is allowed with SUPER -CREATE USER user1@localhost; -GRANT SUPER ON *.* TO user1@localhost; -connect user1,localhost,user1,,; -connection user1; -SET GLOBAL server_id=1; -disconnect user1; -connection default; -DROP USER user1@localhost; SET @@global.server_id=@global; SET @session=@@session.server_id; -# Test that "SET server_id" is not allowed without BINLOG REPLAY or SUPER +# Test that "SET server_id" is not allowed without BINLOG REPLAY CREATE USER user1@localhost; GRANT ALL PRIVILEGES ON *.* TO user1@localhost; -REVOKE BINLOG REPLAY, SUPER ON *.* FROM user1@localhost; +REVOKE BINLOG REPLAY ON *.* FROM user1@localhost; connect user1,localhost,user1,,; connection user1; SET server_id=1; -ERROR 42000: Access denied; you need (at least one of) the SUPER, BINLOG REPLAY privilege(s) for this operation +ERROR 42000: Access denied; you need (at least one of) the BINLOG REPLAY privilege(s) for this operation SET SESSION server_id=1; -ERROR 42000: Access denied; you need (at least one of) the SUPER, BINLOG REPLAY privilege(s) for this operation +ERROR 42000: Access denied; you need (at least one of) the BINLOG REPLAY privilege(s) for this operation disconnect user1; connection default; DROP USER user1@localhost; @@ -56,14 +47,4 @@ SET SESSION server_id=1; disconnect user1; connection default; DROP USER user1@localhost; -# Test that "SET server_id" is allowed with SUPER -CREATE USER user1@localhost; -GRANT SUPER ON *.* TO user1@localhost; -connect user1,localhost,user1,,; -connection user1; -SET server_id=1; -SET SESSION server_id=1; -disconnect user1; -connection default; -DROP USER user1@localhost; SET @@session.server_id=@session; diff --git a/mysql-test/suite/sys_vars/r/session_track_system_variables_basic.result b/mysql-test/suite/sys_vars/r/session_track_system_variables_basic.result index c3f4a4ee..4208a2e3 100644 --- a/mysql-test/suite/sys_vars/r/session_track_system_variables_basic.result +++ b/mysql-test/suite/sys_vars/r/session_track_system_variables_basic.result @@ -5,20 +5,20 @@ # Global - default SELECT @@global.session_track_system_variables; @@global.session_track_system_variables -autocommit,character_set_client,character_set_connection,character_set_results,time_zone +autocommit,character_set_client,character_set_connection,character_set_results,redirect_url,time_zone # Session - default SELECT @@session.session_track_system_variables; @@session.session_track_system_variables -autocommit,character_set_client,character_set_connection,character_set_results,time_zone +autocommit,character_set_client,character_set_connection,character_set_results,redirect_url,time_zone # via INFORMATION_SCHEMA.GLOBAL_VARIABLES SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME LIKE 'session_track_system_variables' ORDER BY VARIABLE_NAME; VARIABLE_NAME VARIABLE_VALUE -SESSION_TRACK_SYSTEM_VARIABLES autocommit,character_set_client,character_set_connection,character_set_results,time_zone +SESSION_TRACK_SYSTEM_VARIABLES autocommit,character_set_client,character_set_connection,character_set_results,redirect_url,time_zone # via INFORMATION_SCHEMA.SESSION_VARIABLES SELECT * FROM INFORMATION_SCHEMA.SESSION_VARIABLES WHERE VARIABLE_NAME LIKE 'session_track_system_variables' ORDER BY VARIABLE_NAME; VARIABLE_NAME VARIABLE_VALUE -SESSION_TRACK_SYSTEM_VARIABLES autocommit,character_set_client,character_set_connection,character_set_results,time_zone +SESSION_TRACK_SYSTEM_VARIABLES autocommit,character_set_client,character_set_connection,character_set_results,redirect_url,time_zone SET @global_saved_tmp = @@global.session_track_system_variables; # Altering global variable's value @@ -28,7 +28,7 @@ SELECT @@global.session_track_system_variables; autocommit SELECT @@session.session_track_system_variables; @@session.session_track_system_variables -autocommit,character_set_client,character_set_connection,character_set_results,time_zone +autocommit,character_set_client,character_set_connection,character_set_results,redirect_url,time_zone # Altering session variable's value SET @@session.session_track_system_variables='autocommit'; @@ -66,25 +66,25 @@ SET @@session.session_track_system_variables = DEFAULT; SELECT @@global.session_track_system_variables; @@global.session_track_system_variables -autocommit,character_set_client,character_set_connection,character_set_results,time_zone +autocommit,character_set_client,character_set_connection,character_set_results,redirect_url,time_zone SELECT @@session.session_track_system_variables; @@session.session_track_system_variables -autocommit,character_set_client,character_set_connection,character_set_results,time_zone +autocommit,character_set_client,character_set_connection,character_set_results,redirect_url,time_zone # Variables' values in a new session (con2). connect con2,"127.0.0.1",root,,test,$MASTER_MYPORT,; SELECT @@global.session_track_system_variables; @@global.session_track_system_variables -autocommit,character_set_client,character_set_connection,character_set_results,time_zone +autocommit,character_set_client,character_set_connection,character_set_results,redirect_url,time_zone SELECT @@session.session_track_system_variables; @@session.session_track_system_variables -autocommit,character_set_client,character_set_connection,character_set_results,time_zone +autocommit,character_set_client,character_set_connection,character_set_results,redirect_url,time_zone # Altering session should not affect global. SET @@session.session_track_system_variables = 'sql_mode'; SELECT @@global.session_track_system_variables; @@global.session_track_system_variables -autocommit,character_set_client,character_set_connection,character_set_results,time_zone +autocommit,character_set_client,character_set_connection,character_set_results,redirect_url,time_zone SELECT @@session.session_track_system_variables; @@session.session_track_system_variables sql_mode @@ -98,7 +98,7 @@ SELECT @@global.session_track_system_variables; sql_mode SELECT @@session.session_track_system_variables; @@session.session_track_system_variables -autocommit,character_set_client,character_set_connection,character_set_results,time_zone +autocommit,character_set_client,character_set_connection,character_set_results,redirect_url,time_zone # Switching to the default connection. connection default; diff --git a/mysql-test/suite/sys_vars/r/slave_compressed_protocol_grant.result b/mysql-test/suite/sys_vars/r/slave_compressed_protocol_grant.result index 2f3f5298..3ef5417d 100644 --- a/mysql-test/suite/sys_vars/r/slave_compressed_protocol_grant.result +++ b/mysql-test/suite/sys_vars/r/slave_compressed_protocol_grant.result @@ -2,14 +2,14 @@ # MDEV-21966 Bind REPLICATION SLAVE ADMIN to a number of global system variables # SET @global=@@global.slave_compressed_protocol; -# Test that "SET slave_compressed_protocol" is not allowed without REPLICATION SLAVE ADMIN or SUPER +# Test that "SET slave_compressed_protocol" is not allowed without REPLICATION SLAVE ADMIN CREATE USER user1@localhost; GRANT ALL PRIVILEGES ON *.* TO user1@localhost; -REVOKE REPLICATION SLAVE ADMIN, SUPER ON *.* FROM user1@localhost; +REVOKE REPLICATION SLAVE ADMIN ON *.* FROM user1@localhost; connect user1,localhost,user1,,; connection user1; SET GLOBAL slave_compressed_protocol=1; -ERROR 42000: Access denied; you need (at least one of) the SUPER, REPLICATION SLAVE ADMIN privilege(s) for this operation +ERROR 42000: Access denied; you need (at least one of) the REPLICATION SLAVE ADMIN privilege(s) for this operation SET slave_compressed_protocol=1; ERROR HY000: Variable 'slave_compressed_protocol' is a GLOBAL variable and should be set with SET GLOBAL SET SESSION slave_compressed_protocol=1; @@ -30,17 +30,4 @@ ERROR HY000: Variable 'slave_compressed_protocol' is a GLOBAL variable and shoul disconnect user1; connection default; DROP USER user1@localhost; -# Test that "SET slave_compressed_protocol" is allowed with SUPER -CREATE USER user1@localhost; -GRANT SUPER ON *.* TO user1@localhost; -connect user1,localhost,user1,,; -connection user1; -SET GLOBAL slave_compressed_protocol=1; -SET slave_compressed_protocol=1; -ERROR HY000: Variable 'slave_compressed_protocol' is a GLOBAL variable and should be set with SET GLOBAL -SET SESSION slave_compressed_protocol=1; -ERROR HY000: Variable 'slave_compressed_protocol' is a GLOBAL variable and should be set with SET GLOBAL -disconnect user1; -connection default; -DROP USER user1@localhost; SET @@global.slave_compressed_protocol=@global; diff --git a/mysql-test/suite/sys_vars/r/slave_ddl_exec_mode_grant.result b/mysql-test/suite/sys_vars/r/slave_ddl_exec_mode_grant.result index d4f21f1e..dc05d6ce 100644 --- a/mysql-test/suite/sys_vars/r/slave_ddl_exec_mode_grant.result +++ b/mysql-test/suite/sys_vars/r/slave_ddl_exec_mode_grant.result @@ -2,14 +2,14 @@ # MDEV-21966 Bind REPLICATION SLAVE ADMIN to a number of global system variables # SET @global=@@global.slave_ddl_exec_mode; -# Test that "SET slave_ddl_exec_mode" is not allowed without REPLICATION SLAVE ADMIN or SUPER +# Test that "SET slave_ddl_exec_mode" is not allowed without REPLICATION SLAVE ADMIN CREATE USER user1@localhost; GRANT ALL PRIVILEGES ON *.* TO user1@localhost; -REVOKE REPLICATION SLAVE ADMIN, SUPER ON *.* FROM user1@localhost; +REVOKE REPLICATION SLAVE ADMIN ON *.* FROM user1@localhost; connect user1,localhost,user1,,; connection user1; SET GLOBAL slave_ddl_exec_mode=STRICT; -ERROR 42000: Access denied; you need (at least one of) the SUPER, REPLICATION SLAVE ADMIN privilege(s) for this operation +ERROR 42000: Access denied; you need (at least one of) the REPLICATION SLAVE ADMIN privilege(s) for this operation SET slave_ddl_exec_mode=STRICT; ERROR HY000: Variable 'slave_ddl_exec_mode' is a GLOBAL variable and should be set with SET GLOBAL SET SESSION slave_ddl_exec_mode=STRICT; @@ -30,17 +30,4 @@ ERROR HY000: Variable 'slave_ddl_exec_mode' is a GLOBAL variable and should be s disconnect user1; connection default; DROP USER user1@localhost; -# Test that "SET slave_ddl_exec_mode" is allowed with SUPER -CREATE USER user1@localhost; -GRANT SUPER ON *.* TO user1@localhost; -connect user1,localhost,user1,,; -connection user1; -SET GLOBAL slave_ddl_exec_mode=STRICT; -SET slave_ddl_exec_mode=STRICT; -ERROR HY000: Variable 'slave_ddl_exec_mode' is a GLOBAL variable and should be set with SET GLOBAL -SET SESSION slave_ddl_exec_mode=STRICT; -ERROR HY000: Variable 'slave_ddl_exec_mode' is a GLOBAL variable and should be set with SET GLOBAL -disconnect user1; -connection default; -DROP USER user1@localhost; SET @@global.slave_ddl_exec_mode=@global; diff --git a/mysql-test/suite/sys_vars/r/slave_domain_parallel_threads_grant.result b/mysql-test/suite/sys_vars/r/slave_domain_parallel_threads_grant.result index f31e48e2..757b188a 100644 --- a/mysql-test/suite/sys_vars/r/slave_domain_parallel_threads_grant.result +++ b/mysql-test/suite/sys_vars/r/slave_domain_parallel_threads_grant.result @@ -2,14 +2,14 @@ # MDEV-21966 Bind REPLICATION SLAVE ADMIN to a number of global system variables # SET @global=@@global.slave_domain_parallel_threads; -# Test that "SET slave_domain_parallel_threads" is not allowed without REPLICATION SLAVE ADMIN or SUPER +# Test that "SET slave_domain_parallel_threads" is not allowed without REPLICATION SLAVE ADMIN CREATE USER user1@localhost; GRANT ALL PRIVILEGES ON *.* TO user1@localhost; -REVOKE REPLICATION SLAVE ADMIN, SUPER ON *.* FROM user1@localhost; +REVOKE REPLICATION SLAVE ADMIN ON *.* FROM user1@localhost; connect user1,localhost,user1,,; connection user1; SET GLOBAL slave_domain_parallel_threads=0; -ERROR 42000: Access denied; you need (at least one of) the SUPER, REPLICATION SLAVE ADMIN privilege(s) for this operation +ERROR 42000: Access denied; you need (at least one of) the REPLICATION SLAVE ADMIN privilege(s) for this operation SET slave_domain_parallel_threads=0; ERROR HY000: Variable 'slave_domain_parallel_threads' is a GLOBAL variable and should be set with SET GLOBAL SET SESSION slave_domain_parallel_threads=0; @@ -30,17 +30,4 @@ ERROR HY000: Variable 'slave_domain_parallel_threads' is a GLOBAL variable and s disconnect user1; connection default; DROP USER user1@localhost; -# Test that "SET slave_domain_parallel_threads" is allowed with SUPER -CREATE USER user1@localhost; -GRANT SUPER ON *.* TO user1@localhost; -connect user1,localhost,user1,,; -connection user1; -SET GLOBAL slave_domain_parallel_threads=0; -SET slave_domain_parallel_threads=0; -ERROR HY000: Variable 'slave_domain_parallel_threads' is a GLOBAL variable and should be set with SET GLOBAL -SET SESSION slave_domain_parallel_threads=0; -ERROR HY000: Variable 'slave_domain_parallel_threads' is a GLOBAL variable and should be set with SET GLOBAL -disconnect user1; -connection default; -DROP USER user1@localhost; SET @@global.slave_domain_parallel_threads=@global; diff --git a/mysql-test/suite/sys_vars/r/slave_exec_mode_grant.result b/mysql-test/suite/sys_vars/r/slave_exec_mode_grant.result index c1cfdba7..7fd5481c 100644 --- a/mysql-test/suite/sys_vars/r/slave_exec_mode_grant.result +++ b/mysql-test/suite/sys_vars/r/slave_exec_mode_grant.result @@ -2,14 +2,14 @@ # MDEV-21966 Bind REPLICATION SLAVE ADMIN to a number of global system variables # SET @global=@@global.slave_exec_mode; -# Test that "SET slave_exec_mode" is not allowed without REPLICATION SLAVE ADMIN or SUPER +# Test that "SET slave_exec_mode" is not allowed without REPLICATION SLAVE ADMIN CREATE USER user1@localhost; GRANT ALL PRIVILEGES ON *.* TO user1@localhost; -REVOKE REPLICATION SLAVE ADMIN, SUPER ON *.* FROM user1@localhost; +REVOKE REPLICATION SLAVE ADMIN ON *.* FROM user1@localhost; connect user1,localhost,user1,,; connection user1; SET GLOBAL slave_exec_mode=STRICT; -ERROR 42000: Access denied; you need (at least one of) the SUPER, REPLICATION SLAVE ADMIN privilege(s) for this operation +ERROR 42000: Access denied; you need (at least one of) the REPLICATION SLAVE ADMIN privilege(s) for this operation SET slave_exec_mode=STRICT; ERROR HY000: Variable 'slave_exec_mode' is a GLOBAL variable and should be set with SET GLOBAL SET SESSION slave_exec_mode=STRICT; @@ -30,17 +30,4 @@ ERROR HY000: Variable 'slave_exec_mode' is a GLOBAL variable and should be set w disconnect user1; connection default; DROP USER user1@localhost; -# Test that "SET slave_exec_mode" is allowed with SUPER -CREATE USER user1@localhost; -GRANT SUPER ON *.* TO user1@localhost; -connect user1,localhost,user1,,; -connection user1; -SET GLOBAL slave_exec_mode=STRICT; -SET slave_exec_mode=STRICT; -ERROR HY000: Variable 'slave_exec_mode' is a GLOBAL variable and should be set with SET GLOBAL -SET SESSION slave_exec_mode=STRICT; -ERROR HY000: Variable 'slave_exec_mode' is a GLOBAL variable and should be set with SET GLOBAL -disconnect user1; -connection default; -DROP USER user1@localhost; SET @@global.slave_exec_mode=@global; diff --git a/mysql-test/suite/sys_vars/r/slave_max_allowed_packet_grant.result b/mysql-test/suite/sys_vars/r/slave_max_allowed_packet_grant.result index 664d580e..45e79aad 100644 --- a/mysql-test/suite/sys_vars/r/slave_max_allowed_packet_grant.result +++ b/mysql-test/suite/sys_vars/r/slave_max_allowed_packet_grant.result @@ -2,14 +2,14 @@ # MDEV-21966 Bind REPLICATION SLAVE ADMIN to a number of global system variables # SET @global=@@global.slave_max_allowed_packet; -# Test that "SET slave_max_allowed_packet" is not allowed without REPLICATION SLAVE ADMIN or SUPER +# Test that "SET slave_max_allowed_packet" is not allowed without REPLICATION SLAVE ADMIN CREATE USER user1@localhost; GRANT ALL PRIVILEGES ON *.* TO user1@localhost; -REVOKE REPLICATION SLAVE ADMIN, SUPER ON *.* FROM user1@localhost; +REVOKE REPLICATION SLAVE ADMIN ON *.* FROM user1@localhost; connect user1,localhost,user1,,; connection user1; SET GLOBAL slave_max_allowed_packet=65536; -ERROR 42000: Access denied; you need (at least one of) the SUPER, REPLICATION SLAVE ADMIN privilege(s) for this operation +ERROR 42000: Access denied; you need (at least one of) the REPLICATION SLAVE ADMIN privilege(s) for this operation SET slave_max_allowed_packet=65536; ERROR HY000: Variable 'slave_max_allowed_packet' is a GLOBAL variable and should be set with SET GLOBAL SET SESSION slave_max_allowed_packet=65536; @@ -30,17 +30,4 @@ ERROR HY000: Variable 'slave_max_allowed_packet' is a GLOBAL variable and should disconnect user1; connection default; DROP USER user1@localhost; -# Test that "SET slave_max_allowed_packet" is allowed with SUPER -CREATE USER user1@localhost; -GRANT SUPER ON *.* TO user1@localhost; -connect user1,localhost,user1,,; -connection user1; -SET GLOBAL slave_max_allowed_packet=65536; -SET slave_max_allowed_packet=65536; -ERROR HY000: Variable 'slave_max_allowed_packet' is a GLOBAL variable and should be set with SET GLOBAL -SET SESSION slave_max_allowed_packet=65536; -ERROR HY000: Variable 'slave_max_allowed_packet' is a GLOBAL variable and should be set with SET GLOBAL -disconnect user1; -connection default; -DROP USER user1@localhost; SET @@global.slave_max_allowed_packet=@global; diff --git a/mysql-test/suite/sys_vars/r/slave_net_timeout_grant.result b/mysql-test/suite/sys_vars/r/slave_net_timeout_grant.result index 2b6664ab..da6e8b04 100644 --- a/mysql-test/suite/sys_vars/r/slave_net_timeout_grant.result +++ b/mysql-test/suite/sys_vars/r/slave_net_timeout_grant.result @@ -2,14 +2,14 @@ # MDEV-21966 Bind REPLICATION SLAVE ADMIN to a number of global system variables # SET @global=@@global.slave_net_timeout; -# Test that "SET slave_net_timeout" is not allowed without REPLICATION SLAVE ADMIN or SUPER +# Test that "SET slave_net_timeout" is not allowed without REPLICATION SLAVE ADMIN CREATE USER user1@localhost; GRANT ALL PRIVILEGES ON *.* TO user1@localhost; -REVOKE REPLICATION SLAVE ADMIN, SUPER ON *.* FROM user1@localhost; +REVOKE REPLICATION SLAVE ADMIN ON *.* FROM user1@localhost; connect user1,localhost,user1,,; connection user1; SET GLOBAL slave_net_timeout=60; -ERROR 42000: Access denied; you need (at least one of) the SUPER, REPLICATION SLAVE ADMIN privilege(s) for this operation +ERROR 42000: Access denied; you need (at least one of) the REPLICATION SLAVE ADMIN privilege(s) for this operation SET slave_net_timeout=60; ERROR HY000: Variable 'slave_net_timeout' is a GLOBAL variable and should be set with SET GLOBAL SET SESSION slave_net_timeout=60; @@ -30,17 +30,4 @@ ERROR HY000: Variable 'slave_net_timeout' is a GLOBAL variable and should be set disconnect user1; connection default; DROP USER user1@localhost; -# Test that "SET slave_net_timeout" is allowed with SUPER -CREATE USER user1@localhost; -GRANT SUPER ON *.* TO user1@localhost; -connect user1,localhost,user1,,; -connection user1; -SET GLOBAL slave_net_timeout=60; -SET slave_net_timeout=60; -ERROR HY000: Variable 'slave_net_timeout' is a GLOBAL variable and should be set with SET GLOBAL -SET SESSION slave_net_timeout=60; -ERROR HY000: Variable 'slave_net_timeout' is a GLOBAL variable and should be set with SET GLOBAL -disconnect user1; -connection default; -DROP USER user1@localhost; SET @@global.slave_net_timeout=@global; diff --git a/mysql-test/suite/sys_vars/r/slave_parallel_max_queued_grant.result b/mysql-test/suite/sys_vars/r/slave_parallel_max_queued_grant.result index 315de478..9594c7ce 100644 --- a/mysql-test/suite/sys_vars/r/slave_parallel_max_queued_grant.result +++ b/mysql-test/suite/sys_vars/r/slave_parallel_max_queued_grant.result @@ -2,14 +2,14 @@ # MDEV-21966 Bind REPLICATION SLAVE ADMIN to a number of global system variables # SET @global=@@global.slave_parallel_max_queued; -# Test that "SET slave_parallel_max_queued" is not allowed without REPLICATION SLAVE ADMIN or SUPER +# Test that "SET slave_parallel_max_queued" is not allowed without REPLICATION SLAVE ADMIN CREATE USER user1@localhost; GRANT ALL PRIVILEGES ON *.* TO user1@localhost; -REVOKE REPLICATION SLAVE ADMIN, SUPER ON *.* FROM user1@localhost; +REVOKE REPLICATION SLAVE ADMIN ON *.* FROM user1@localhost; connect user1,localhost,user1,,; connection user1; SET GLOBAL slave_parallel_max_queued=65536; -ERROR 42000: Access denied; you need (at least one of) the SUPER, REPLICATION SLAVE ADMIN privilege(s) for this operation +ERROR 42000: Access denied; you need (at least one of) the REPLICATION SLAVE ADMIN privilege(s) for this operation SET slave_parallel_max_queued=65536; ERROR HY000: Variable 'slave_parallel_max_queued' is a GLOBAL variable and should be set with SET GLOBAL SET SESSION slave_parallel_max_queued=65536; @@ -30,17 +30,4 @@ ERROR HY000: Variable 'slave_parallel_max_queued' is a GLOBAL variable and shoul disconnect user1; connection default; DROP USER user1@localhost; -# Test that "SET slave_parallel_max_queued" is allowed with SUPER -CREATE USER user1@localhost; -GRANT SUPER ON *.* TO user1@localhost; -connect user1,localhost,user1,,; -connection user1; -SET GLOBAL slave_parallel_max_queued=65536; -SET slave_parallel_max_queued=65536; -ERROR HY000: Variable 'slave_parallel_max_queued' is a GLOBAL variable and should be set with SET GLOBAL -SET SESSION slave_parallel_max_queued=65536; -ERROR HY000: Variable 'slave_parallel_max_queued' is a GLOBAL variable and should be set with SET GLOBAL -disconnect user1; -connection default; -DROP USER user1@localhost; SET @@global.slave_parallel_max_queued=@global; diff --git a/mysql-test/suite/sys_vars/r/slave_parallel_mode_grant.result b/mysql-test/suite/sys_vars/r/slave_parallel_mode_grant.result index 6d5da37d..1bb894f9 100644 --- a/mysql-test/suite/sys_vars/r/slave_parallel_mode_grant.result +++ b/mysql-test/suite/sys_vars/r/slave_parallel_mode_grant.result @@ -2,14 +2,14 @@ # MDEV-21966 Bind REPLICATION SLAVE ADMIN to a number of global system variables # SET @global=@@global.slave_parallel_mode; -# Test that "SET slave_parallel_mode" is not allowed without REPLICATION SLAVE ADMIN or SUPER +# Test that "SET slave_parallel_mode" is not allowed without REPLICATION SLAVE ADMIN CREATE USER user1@localhost; GRANT ALL PRIVILEGES ON *.* TO user1@localhost; -REVOKE REPLICATION SLAVE ADMIN, SUPER ON *.* FROM user1@localhost; +REVOKE REPLICATION SLAVE ADMIN ON *.* FROM user1@localhost; connect user1,localhost,user1,,; connection user1; SET GLOBAL slave_parallel_mode=1; -ERROR 42000: Access denied; you need (at least one of) the SUPER, REPLICATION SLAVE ADMIN privilege(s) for this operation +ERROR 42000: Access denied; you need (at least one of) the REPLICATION SLAVE ADMIN privilege(s) for this operation SET slave_parallel_mode=1; ERROR HY000: Variable 'slave_parallel_mode' is a GLOBAL variable and should be set with SET GLOBAL SET SESSION slave_parallel_mode=1; @@ -30,17 +30,4 @@ ERROR HY000: Variable 'slave_parallel_mode' is a GLOBAL variable and should be s disconnect user1; connection default; DROP USER user1@localhost; -# Test that "SET slave_parallel_mode" is allowed with SUPER -CREATE USER user1@localhost; -GRANT SUPER ON *.* TO user1@localhost; -connect user1,localhost,user1,,; -connection user1; -SET GLOBAL slave_parallel_mode=1; -SET slave_parallel_mode=1; -ERROR HY000: Variable 'slave_parallel_mode' is a GLOBAL variable and should be set with SET GLOBAL -SET SESSION slave_parallel_mode=1; -ERROR HY000: Variable 'slave_parallel_mode' is a GLOBAL variable and should be set with SET GLOBAL -disconnect user1; -connection default; -DROP USER user1@localhost; SET @@global.slave_parallel_mode=@global; diff --git a/mysql-test/suite/sys_vars/r/slave_parallel_threads_grant.result b/mysql-test/suite/sys_vars/r/slave_parallel_threads_grant.result index 147252f7..a1dbcfc6 100644 --- a/mysql-test/suite/sys_vars/r/slave_parallel_threads_grant.result +++ b/mysql-test/suite/sys_vars/r/slave_parallel_threads_grant.result @@ -2,14 +2,14 @@ # MDEV-21966 Bind REPLICATION SLAVE ADMIN to a number of global system variables # SET @global=@@global.slave_parallel_threads; -# Test that "SET slave_parallel_threads" is not allowed without REPLICATION SLAVE ADMIN or SUPER +# Test that "SET slave_parallel_threads" is not allowed without REPLICATION SLAVE ADMIN CREATE USER user1@localhost; GRANT ALL PRIVILEGES ON *.* TO user1@localhost; -REVOKE REPLICATION SLAVE ADMIN, SUPER ON *.* FROM user1@localhost; +REVOKE REPLICATION SLAVE ADMIN ON *.* FROM user1@localhost; connect user1,localhost,user1,,; connection user1; SET GLOBAL slave_parallel_threads=256; -ERROR 42000: Access denied; you need (at least one of) the SUPER, REPLICATION SLAVE ADMIN privilege(s) for this operation +ERROR 42000: Access denied; you need (at least one of) the REPLICATION SLAVE ADMIN privilege(s) for this operation SET slave_parallel_threads=256; ERROR HY000: Variable 'slave_parallel_threads' is a GLOBAL variable and should be set with SET GLOBAL SET SESSION slave_parallel_threads=256; @@ -30,17 +30,4 @@ ERROR HY000: Variable 'slave_parallel_threads' is a GLOBAL variable and should b disconnect user1; connection default; DROP USER user1@localhost; -# Test that "SET slave_parallel_threads" is allowed with SUPER -CREATE USER user1@localhost; -GRANT SUPER ON *.* TO user1@localhost; -connect user1,localhost,user1,,; -connection user1; -SET GLOBAL slave_parallel_threads=256; -SET slave_parallel_threads=256; -ERROR HY000: Variable 'slave_parallel_threads' is a GLOBAL variable and should be set with SET GLOBAL -SET SESSION slave_parallel_threads=256; -ERROR HY000: Variable 'slave_parallel_threads' is a GLOBAL variable and should be set with SET GLOBAL -disconnect user1; -connection default; -DROP USER user1@localhost; SET @@global.slave_parallel_threads=@global; diff --git a/mysql-test/suite/sys_vars/r/slave_parallel_workers_grant.result b/mysql-test/suite/sys_vars/r/slave_parallel_workers_grant.result index 1985cc42..0de4af52 100644 --- a/mysql-test/suite/sys_vars/r/slave_parallel_workers_grant.result +++ b/mysql-test/suite/sys_vars/r/slave_parallel_workers_grant.result @@ -2,14 +2,14 @@ # MDEV-21966 Bind REPLICATION SLAVE ADMIN to a number of global system variables # SET @global=@@global.slave_parallel_workers; -# Test that "SET slave_parallel_workers" is not allowed without REPLICATION SLAVE ADMIN or SUPER +# Test that "SET slave_parallel_workers" is not allowed without REPLICATION SLAVE ADMIN CREATE USER user1@localhost; GRANT ALL PRIVILEGES ON *.* TO user1@localhost; -REVOKE REPLICATION SLAVE ADMIN, SUPER ON *.* FROM user1@localhost; +REVOKE REPLICATION SLAVE ADMIN ON *.* FROM user1@localhost; connect user1,localhost,user1,,; connection user1; SET GLOBAL slave_parallel_workers=256; -ERROR 42000: Access denied; you need (at least one of) the SUPER, REPLICATION SLAVE ADMIN privilege(s) for this operation +ERROR 42000: Access denied; you need (at least one of) the REPLICATION SLAVE ADMIN privilege(s) for this operation SET slave_parallel_workers=256; ERROR HY000: Variable 'slave_parallel_workers' is a GLOBAL variable and should be set with SET GLOBAL SET SESSION slave_parallel_workers=256; @@ -30,17 +30,4 @@ ERROR HY000: Variable 'slave_parallel_workers' is a GLOBAL variable and should b disconnect user1; connection default; DROP USER user1@localhost; -# Test that "SET slave_parallel_workers" is allowed with SUPER -CREATE USER user1@localhost; -GRANT SUPER ON *.* TO user1@localhost; -connect user1,localhost,user1,,; -connection user1; -SET GLOBAL slave_parallel_workers=256; -SET slave_parallel_workers=256; -ERROR HY000: Variable 'slave_parallel_workers' is a GLOBAL variable and should be set with SET GLOBAL -SET SESSION slave_parallel_workers=256; -ERROR HY000: Variable 'slave_parallel_workers' is a GLOBAL variable and should be set with SET GLOBAL -disconnect user1; -connection default; -DROP USER user1@localhost; SET @@global.slave_parallel_workers=@global; diff --git a/mysql-test/suite/sys_vars/r/slave_run_triggers_for_rbr_grant.result b/mysql-test/suite/sys_vars/r/slave_run_triggers_for_rbr_grant.result index fd33c95f..fea67a80 100644 --- a/mysql-test/suite/sys_vars/r/slave_run_triggers_for_rbr_grant.result +++ b/mysql-test/suite/sys_vars/r/slave_run_triggers_for_rbr_grant.result @@ -2,14 +2,14 @@ # MDEV-21966 Bind REPLICATION SLAVE ADMIN to a number of global system variables # SET @global=@@global.slave_run_triggers_for_rbr; -# Test that "SET slave_run_triggers_for_rbr" is not allowed without REPLICATION SLAVE ADMIN or SUPER +# Test that "SET slave_run_triggers_for_rbr" is not allowed without REPLICATION SLAVE ADMIN CREATE USER user1@localhost; GRANT ALL PRIVILEGES ON *.* TO user1@localhost; -REVOKE REPLICATION SLAVE ADMIN, SUPER ON *.* FROM user1@localhost; +REVOKE REPLICATION SLAVE ADMIN ON *.* FROM user1@localhost; connect user1,localhost,user1,,; connection user1; SET GLOBAL slave_run_triggers_for_rbr=YES; -ERROR 42000: Access denied; you need (at least one of) the SUPER, REPLICATION SLAVE ADMIN privilege(s) for this operation +ERROR 42000: Access denied; you need (at least one of) the REPLICATION SLAVE ADMIN privilege(s) for this operation SET slave_run_triggers_for_rbr=YES; ERROR HY000: Variable 'slave_run_triggers_for_rbr' is a GLOBAL variable and should be set with SET GLOBAL SET SESSION slave_run_triggers_for_rbr=YES; @@ -30,17 +30,4 @@ ERROR HY000: Variable 'slave_run_triggers_for_rbr' is a GLOBAL variable and shou disconnect user1; connection default; DROP USER user1@localhost; -# Test that "SET slave_run_triggers_for_rbr" is allowed with SUPER -CREATE USER user1@localhost; -GRANT SUPER ON *.* TO user1@localhost; -connect user1,localhost,user1,,; -connection user1; -SET GLOBAL slave_run_triggers_for_rbr=YES; -SET slave_run_triggers_for_rbr=YES; -ERROR HY000: Variable 'slave_run_triggers_for_rbr' is a GLOBAL variable and should be set with SET GLOBAL -SET SESSION slave_run_triggers_for_rbr=YES; -ERROR HY000: Variable 'slave_run_triggers_for_rbr' is a GLOBAL variable and should be set with SET GLOBAL -disconnect user1; -connection default; -DROP USER user1@localhost; SET @@global.slave_run_triggers_for_rbr=@global; diff --git a/mysql-test/suite/sys_vars/r/slave_sql_verify_checksum_grant.result b/mysql-test/suite/sys_vars/r/slave_sql_verify_checksum_grant.result index 1cc4f3f3..236b3a34 100644 --- a/mysql-test/suite/sys_vars/r/slave_sql_verify_checksum_grant.result +++ b/mysql-test/suite/sys_vars/r/slave_sql_verify_checksum_grant.result @@ -2,14 +2,14 @@ # MDEV-21966 Bind REPLICATION SLAVE ADMIN to a number of global system variables # SET @global=@@global.slave_sql_verify_checksum; -# Test that "SET slave_sql_verify_checksum" is not allowed without REPLICATION SLAVE ADMIN or SUPER +# Test that "SET slave_sql_verify_checksum" is not allowed without REPLICATION SLAVE ADMIN CREATE USER user1@localhost; GRANT ALL PRIVILEGES ON *.* TO user1@localhost; -REVOKE REPLICATION SLAVE ADMIN, SUPER ON *.* FROM user1@localhost; +REVOKE REPLICATION SLAVE ADMIN ON *.* FROM user1@localhost; connect user1,localhost,user1,,; connection user1; SET GLOBAL slave_sql_verify_checksum=1; -ERROR 42000: Access denied; you need (at least one of) the SUPER, REPLICATION SLAVE ADMIN privilege(s) for this operation +ERROR 42000: Access denied; you need (at least one of) the REPLICATION SLAVE ADMIN privilege(s) for this operation SET slave_sql_verify_checksum=1; ERROR HY000: Variable 'slave_sql_verify_checksum' is a GLOBAL variable and should be set with SET GLOBAL SET SESSION slave_sql_verify_checksum=1; @@ -30,17 +30,4 @@ ERROR HY000: Variable 'slave_sql_verify_checksum' is a GLOBAL variable and shoul disconnect user1; connection default; DROP USER user1@localhost; -# Test that "SET slave_sql_verify_checksum" is allowed with SUPER -CREATE USER user1@localhost; -GRANT SUPER ON *.* TO user1@localhost; -connect user1,localhost,user1,,; -connection user1; -SET GLOBAL slave_sql_verify_checksum=1; -SET slave_sql_verify_checksum=1; -ERROR HY000: Variable 'slave_sql_verify_checksum' is a GLOBAL variable and should be set with SET GLOBAL -SET SESSION slave_sql_verify_checksum=1; -ERROR HY000: Variable 'slave_sql_verify_checksum' is a GLOBAL variable and should be set with SET GLOBAL -disconnect user1; -connection default; -DROP USER user1@localhost; SET @@global.slave_sql_verify_checksum=@global; diff --git a/mysql-test/suite/sys_vars/r/slave_transaction_retry_interval_grant.result b/mysql-test/suite/sys_vars/r/slave_transaction_retry_interval_grant.result index e2e5e396..ac144e62 100644 --- a/mysql-test/suite/sys_vars/r/slave_transaction_retry_interval_grant.result +++ b/mysql-test/suite/sys_vars/r/slave_transaction_retry_interval_grant.result @@ -2,14 +2,14 @@ # MDEV-21966 Bind REPLICATION SLAVE ADMIN to a number of global system variables # SET @global=@@global.slave_transaction_retry_interval; -# Test that "SET slave_transaction_retry_interval" is not allowed without REPLICATION SLAVE ADMIN or SUPER +# Test that "SET slave_transaction_retry_interval" is not allowed without REPLICATION SLAVE ADMIN CREATE USER user1@localhost; GRANT ALL PRIVILEGES ON *.* TO user1@localhost; -REVOKE REPLICATION SLAVE ADMIN, SUPER ON *.* FROM user1@localhost; +REVOKE REPLICATION SLAVE ADMIN ON *.* FROM user1@localhost; connect user1,localhost,user1,,; connection user1; SET GLOBAL slave_transaction_retry_interval=256; -ERROR 42000: Access denied; you need (at least one of) the SUPER, REPLICATION SLAVE ADMIN privilege(s) for this operation +ERROR 42000: Access denied; you need (at least one of) the REPLICATION SLAVE ADMIN privilege(s) for this operation SET slave_transaction_retry_interval=256; ERROR HY000: Variable 'slave_transaction_retry_interval' is a GLOBAL variable and should be set with SET GLOBAL SET SESSION slave_transaction_retry_interval=256; @@ -30,17 +30,4 @@ ERROR HY000: Variable 'slave_transaction_retry_interval' is a GLOBAL variable an disconnect user1; connection default; DROP USER user1@localhost; -# Test that "SET slave_transaction_retry_interval" is allowed with SUPER -CREATE USER user1@localhost; -GRANT SUPER ON *.* TO user1@localhost; -connect user1,localhost,user1,,; -connection user1; -SET GLOBAL slave_transaction_retry_interval=256; -SET slave_transaction_retry_interval=256; -ERROR HY000: Variable 'slave_transaction_retry_interval' is a GLOBAL variable and should be set with SET GLOBAL -SET SESSION slave_transaction_retry_interval=256; -ERROR HY000: Variable 'slave_transaction_retry_interval' is a GLOBAL variable and should be set with SET GLOBAL -disconnect user1; -connection default; -DROP USER user1@localhost; SET @@global.slave_transaction_retry_interval=@global; diff --git a/mysql-test/suite/sys_vars/r/slave_type_conversions_grant.result b/mysql-test/suite/sys_vars/r/slave_type_conversions_grant.result index 01022e73..5057f190 100644 --- a/mysql-test/suite/sys_vars/r/slave_type_conversions_grant.result +++ b/mysql-test/suite/sys_vars/r/slave_type_conversions_grant.result @@ -2,14 +2,14 @@ # MDEV-21966 Bind REPLICATION SLAVE ADMIN to a number of global system variables # SET @global=@@global.slave_type_conversions; -# Test that "SET slave_type_conversions" is not allowed without REPLICATION SLAVE ADMIN or SUPER +# Test that "SET slave_type_conversions" is not allowed without REPLICATION SLAVE ADMIN CREATE USER user1@localhost; GRANT ALL PRIVILEGES ON *.* TO user1@localhost; -REVOKE REPLICATION SLAVE ADMIN, SUPER ON *.* FROM user1@localhost; +REVOKE REPLICATION SLAVE ADMIN ON *.* FROM user1@localhost; connect user1,localhost,user1,,; connection user1; SET GLOBAL slave_type_conversions=ALL_NON_LOSSY; -ERROR 42000: Access denied; you need (at least one of) the SUPER, REPLICATION SLAVE ADMIN privilege(s) for this operation +ERROR 42000: Access denied; you need (at least one of) the REPLICATION SLAVE ADMIN privilege(s) for this operation SET slave_type_conversions=ALL_NON_LOSSY; ERROR HY000: Variable 'slave_type_conversions' is a GLOBAL variable and should be set with SET GLOBAL SET SESSION slave_type_conversions=ALL_NON_LOSSY; @@ -30,17 +30,4 @@ ERROR HY000: Variable 'slave_type_conversions' is a GLOBAL variable and should b disconnect user1; connection default; DROP USER user1@localhost; -# Test that "SET slave_type_conversions" is allowed with SUPER -CREATE USER user1@localhost; -GRANT SUPER ON *.* TO user1@localhost; -connect user1,localhost,user1,,; -connection user1; -SET GLOBAL slave_type_conversions=ALL_NON_LOSSY; -SET slave_type_conversions=ALL_NON_LOSSY; -ERROR HY000: Variable 'slave_type_conversions' is a GLOBAL variable and should be set with SET GLOBAL -SET SESSION slave_type_conversions=ALL_NON_LOSSY; -ERROR HY000: Variable 'slave_type_conversions' is a GLOBAL variable and should be set with SET GLOBAL -disconnect user1; -connection default; -DROP USER user1@localhost; SET @@global.slave_type_conversions=@global; diff --git a/mysql-test/suite/sys_vars/r/slow_launch_time_grant.result b/mysql-test/suite/sys_vars/r/slow_launch_time_grant.result index 45aef07d..52435ae3 100644 --- a/mysql-test/suite/sys_vars/r/slow_launch_time_grant.result +++ b/mysql-test/suite/sys_vars/r/slow_launch_time_grant.result @@ -2,14 +2,14 @@ SET @global=@@global.slow_launch_time; # # MDEV-21961 Bind CONNECTION ADMIN to a number of global system variables # -# Test that "SET slow_launch_time" is not allowed without CONNECTION ADMIN or SUPER +# Test that "SET slow_launch_time" is not allowed without CONNECTION ADMIN CREATE USER user1@localhost; GRANT ALL PRIVILEGES ON *.* TO user1@localhost; -REVOKE CONNECTION ADMIN, SUPER ON *.* FROM user1@localhost; +REVOKE CONNECTION ADMIN ON *.* FROM user1@localhost; connect user1,localhost,user1,,; connection user1; SET GLOBAL slow_launch_time=10; -ERROR 42000: Access denied; you need (at least one of) the SUPER, CONNECTION ADMIN privilege(s) for this operation +ERROR 42000: Access denied; you need (at least one of) the CONNECTION ADMIN privilege(s) for this operation SET slow_launch_time=10; ERROR HY000: Variable 'slow_launch_time' is a GLOBAL variable and should be set with SET GLOBAL SET SESSION slow_launch_time=10; @@ -30,17 +30,4 @@ ERROR HY000: Variable 'slow_launch_time' is a GLOBAL variable and should be set disconnect user1; connection default; DROP USER user1@localhost; -# Test that "SET slow_launch_time" is allowed with SUPER -CREATE USER user1@localhost; -GRANT SUPER ON *.* TO user1@localhost; -connect user1,localhost,user1,,; -connection user1; -SET GLOBAL slow_launch_time=10; -SET slow_launch_time=10; -ERROR HY000: Variable 'slow_launch_time' is a GLOBAL variable and should be set with SET GLOBAL -SET SESSION slow_launch_time=10; -ERROR HY000: Variable 'slow_launch_time' is a GLOBAL variable and should be set with SET GLOBAL -disconnect user1; -connection default; -DROP USER user1@localhost; SET @@global.slow_launch_time=@global; diff --git a/mysql-test/suite/sys_vars/r/sql_big_selects_func.result b/mysql-test/suite/sys_vars/r/sql_big_selects_func.result index 609401c7..104103f6 100644 --- a/mysql-test/suite/sys_vars/r/sql_big_selects_func.result +++ b/mysql-test/suite/sys_vars/r/sql_big_selects_func.result @@ -3,7 +3,7 @@ SET @session_sql_big_selects = @@SESSION.sql_big_selects; SET @session_max_join_size = @@SESSION.max_join_size; SET @global_max_join_size = @@GLOBAL.max_join_size; -SET MAX_JOIN_SIZE=9; +SET MAX_JOIN_SIZE=21; CREATE TEMPORARY TABLE t1(a varchar(20) not null, b varchar(20)); CREATE TEMPORARY TABLE t2(a varchar(20) null, b varchar(20)); INSERT INTO t1 VALUES('aa','bb'); diff --git a/mysql-test/suite/sys_vars/r/sql_log_bin_grant.result b/mysql-test/suite/sys_vars/r/sql_log_bin_grant.result index 574c53e1..336b2943 100644 --- a/mysql-test/suite/sys_vars/r/sql_log_bin_grant.result +++ b/mysql-test/suite/sys_vars/r/sql_log_bin_grant.result @@ -1,18 +1,18 @@ # # # -# Test that "SET sql_log_bin" is not allowed without BINLOG ADMIN or SUPER +# Test that "SET sql_log_bin" is not allowed without BINLOG ADMIN CREATE USER user1@localhost; GRANT ALL PRIVILEGES ON *.* TO user1@localhost; -REVOKE BINLOG ADMIN, SUPER ON *.* FROM user1@localhost; +REVOKE BINLOG ADMIN ON *.* FROM user1@localhost; connect user1,localhost,user1,,; connection user1; SET sql_log_bin=1; -ERROR 42000: Access denied; you need (at least one of) the SUPER, BINLOG ADMIN privilege(s) for this operation +ERROR 42000: Access denied; you need (at least one of) the BINLOG ADMIN privilege(s) for this operation SET GLOBAL sql_log_bin=1; -ERROR 42000: Access denied; you need (at least one of) the SUPER, BINLOG ADMIN privilege(s) for this operation +ERROR 42000: Access denied; you need (at least one of) the BINLOG ADMIN privilege(s) for this operation SET SESSION sql_log_bin=1; -ERROR 42000: Access denied; you need (at least one of) the SUPER, BINLOG ADMIN privilege(s) for this operation +ERROR 42000: Access denied; you need (at least one of) the BINLOG ADMIN privilege(s) for this operation disconnect user1; connection default; DROP USER user1@localhost; @@ -28,15 +28,3 @@ SET SESSION sql_log_bin=1; disconnect user1; connection default; DROP USER user1@localhost; -# Test that "SET sql_log_bin" is allowed with SUPER -CREATE USER user1@localhost; -GRANT SUPER ON *.* TO user1@localhost; -connect user1,localhost,user1,,; -connection user1; -SET sql_log_bin=1; -SET GLOBAL sql_log_bin=1; -ERROR HY000: Variable 'sql_log_bin' is a SESSION variable -SET SESSION sql_log_bin=1; -disconnect user1; -connection default; -DROP USER user1@localhost; diff --git a/mysql-test/suite/sys_vars/r/sql_notes_basic.result b/mysql-test/suite/sys_vars/r/sql_notes_basic.result deleted file mode 100644 index 7a54f90f..00000000 --- a/mysql-test/suite/sys_vars/r/sql_notes_basic.result +++ /dev/null @@ -1,107 +0,0 @@ -SET @session_start_value = @@session.sql_notes; -SELECT @session_start_value; -@session_start_value -1 -'#--------------------FN_DYNVARS_161_01------------------------#' -SET @@session.sql_notes = 0; -SET @@session.sql_notes = DEFAULT; -SELECT @@session.sql_notes; -@@session.sql_notes -1 -SET @@session.sql_notes = 1; -SET @@session.sql_notes = DEFAULT; -SELECT @@session.sql_notes; -@@session.sql_notes -1 -'#---------------------FN_DYNVARS_161_02-------------------------#' -SET sql_notes = 1; -SELECT @@sql_notes; -@@sql_notes -1 -SELECT session.sql_notes; -ERROR 42S02: Unknown table 'session' in field list -SELECT local.sql_notes; -ERROR 42S02: Unknown table 'local' in field list -SET session sql_notes = 0; -SELECT @@session.sql_notes; -@@session.sql_notes -0 -'#--------------------FN_DYNVARS_161_03------------------------#' -SET @@session.sql_notes = 0; -SELECT @@session.sql_notes; -@@session.sql_notes -0 -SET @@session.sql_notes = 1; -SELECT @@session.sql_notes; -@@session.sql_notes -1 -'#--------------------FN_DYNVARS_161_04-------------------------#' -SET @@session.sql_notes = -1; -ERROR 42000: Variable 'sql_notes' can't be set to the value of '-1' -SET @@session.sql_notes = 2; -ERROR 42000: Variable 'sql_notes' can't be set to the value of '2' -SET @@session.sql_notes = "T"; -ERROR 42000: Variable 'sql_notes' can't be set to the value of 'T' -SET @@session.sql_notes = "Y"; -ERROR 42000: Variable 'sql_notes' can't be set to the value of 'Y' -SET @@session.sql_notes = TRÜE; -ERROR 42000: Variable 'sql_notes' can't be set to the value of 'TRÜE' -SET @@session.sql_notes = ÕN; -ERROR 42000: Variable 'sql_notes' can't be set to the value of 'ÕN' -SET @@session.sql_notes = OF; -ERROR 42000: Variable 'sql_notes' can't be set to the value of 'OF' -SET @@session.sql_notes = ÓFF; -ERROR 42000: Variable 'sql_notes' can't be set to the value of 'ÓFF' -SET @@session.sql_notes = '¹'; -ERROR 42000: Variable 'sql_notes' can't be set to the value of '¹' -SET @@session.sql_notes = NO; -ERROR 42000: Variable 'sql_notes' can't be set to the value of 'NO' -'#-------------------FN_DYNVARS_161_05----------------------------#' -SET @@global.sql_notes = 1-@@global.sql_notes; -SELECT @@global.sql_notes; -@@global.sql_notes -0 -SET @@global.sql_notes = 1-@@global.sql_notes; -SELECT @@global.sql_notes; -@@global.sql_notes -1 -'#----------------------FN_DYNVARS_161_06------------------------#' -SELECT count(VARIABLE_VALUE) FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='sql_notes'; -count(VARIABLE_VALUE) -1 -'#----------------------FN_DYNVARS_161_07------------------------#' -SELECT IF(@@session.sql_notes, "ON", "OFF") = VARIABLE_VALUE -FROM INFORMATION_SCHEMA.SESSION_VARIABLES -WHERE VARIABLE_NAME='sql_notes'; -IF(@@session.sql_notes, "ON", "OFF") = VARIABLE_VALUE -1 -SELECT @@session.sql_notes; -@@session.sql_notes -1 -SELECT VARIABLE_VALUE -FROM INFORMATION_SCHEMA.SESSION_VARIABLES -WHERE VARIABLE_NAME='sql_notes'; -VARIABLE_VALUE -ON -'#---------------------FN_DYNVARS_161_08-------------------------#' -SET @@session.sql_notes = OFF; -SELECT @@session.sql_notes; -@@session.sql_notes -0 -SET @@session.sql_notes = ON; -SELECT @@session.sql_notes; -@@session.sql_notes -1 -'#---------------------FN_DYNVARS_161_09----------------------#' -SET @@session.sql_notes = TRUE; -SELECT @@session.sql_notes; -@@session.sql_notes -1 -SET @@session.sql_notes = FALSE; -SELECT @@session.sql_notes; -@@session.sql_notes -0 -SET @@session.sql_notes = @session_start_value; -SELECT @@session.sql_notes; -@@session.sql_notes -1 diff --git a/mysql-test/suite/sys_vars/r/sql_notes_func.result b/mysql-test/suite/sys_vars/r/sql_notes_func.result index 51da0ea5..1871dd2d 100644 --- a/mysql-test/suite/sys_vars/r/sql_notes_func.result +++ b/mysql-test/suite/sys_vars/r/sql_notes_func.result @@ -3,6 +3,8 @@ SET @default_sql_notes = @@sql_notes; '#--------------------FN_DYNVARS_162_01-------------------------#' SET SESSION sql_notes = ON; +Warnings: +Warning 1287 '@@sql_notes' is deprecated and will be removed in a future release. Please use '@@note_verbosity' instead creating a temporary table CREATE TEMPORARY TABLE t1(a varchar(20), b varchar(20)); conditionally dropping the table twice so that a note generates @@ -20,6 +22,8 @@ SELECT @@warning_count; 1 Expected '#--------------------FN_DYNVARS_162_02-------------------------#' SET SESSION sql_notes = OFF; +Warnings: +Warning 1287 '@@sql_notes' is deprecated and will be removed in a future release. Please use '@@note_verbosity' instead creating a temporary table CREATE TEMPORARY TABLE t1(a varchar(20), b varchar(20)); conditionally dropping the table twice so that a note generates @@ -41,6 +45,8 @@ SELECT @@SESSION.sql_notes; 1 1 / TRUE Expected SET SESSION sql_notes = FALSE; +Warnings: +Warning 1287 '@@sql_notes' is deprecated and will be removed in a future release. Please use '@@note_verbosity' instead connect con_int2,localhost,root,,; connection con_int2; SELECT @@SESSION.sql_notes; @@ -48,6 +54,8 @@ SELECT @@SESSION.sql_notes; 1 1 / TRUE Expected SET SESSION sql_notes = TRUE; +Warnings: +Warning 1287 '@@sql_notes' is deprecated and will be removed in a future release. Please use '@@note_verbosity' instead connection con_int2; SELECT @@SESSION.sql_notes; @@SESSION.sql_notes @@ -62,4 +70,6 @@ connection default; disconnect con_int1; disconnect con_int2; SET SESSION sql_notes = @default_sql_notes; +Warnings: +Warning 1287 '@@sql_notes' is deprecated and will be removed in a future release. Please use '@@note_verbosity' instead DROP TABLE IF EXISTS t1; diff --git a/mysql-test/suite/sys_vars/r/stored_program_cache_func.result b/mysql-test/suite/sys_vars/r/stored_program_cache_func.result index 11151847..13b15ea7 100644 --- a/mysql-test/suite/sys_vars/r/stored_program_cache_func.result +++ b/mysql-test/suite/sys_vars/r/stored_program_cache_func.result @@ -41,8 +41,7 @@ end | call pr(1); b call pr(2); -ERROR 42S22: Unknown column 'test.t1.b' in 'field list' -drop table t1; +a set global stored_program_cache=0; call pr(1); b diff --git a/mysql-test/suite/sys_vars/r/sync_binlog_grant.result b/mysql-test/suite/sys_vars/r/sync_binlog_grant.result index 1fcdf8b0..b66ba1fb 100644 --- a/mysql-test/suite/sys_vars/r/sync_binlog_grant.result +++ b/mysql-test/suite/sys_vars/r/sync_binlog_grant.result @@ -2,14 +2,14 @@ # MDEV-21963 Bind BINLOG ADMIN to a number of global system variables # SET @global=@@global.sync_binlog; -# Test that "SET sync_binlog" is not allowed without BINLOG ADMIN or SUPER +# Test that "SET sync_binlog" is not allowed without BINLOG ADMIN CREATE USER user1@localhost; GRANT ALL PRIVILEGES ON *.* TO user1@localhost; -REVOKE BINLOG ADMIN, SUPER ON *.* FROM user1@localhost; +REVOKE BINLOG ADMIN ON *.* FROM user1@localhost; connect user1,localhost,user1,,; connection user1; SET GLOBAL sync_binlog=10; -ERROR 42000: Access denied; you need (at least one of) the SUPER, BINLOG ADMIN privilege(s) for this operation +ERROR 42000: Access denied; you need (at least one of) the BINLOG ADMIN privilege(s) for this operation SET sync_binlog=10; ERROR HY000: Variable 'sync_binlog' is a GLOBAL variable and should be set with SET GLOBAL SET SESSION sync_binlog=10; @@ -30,17 +30,4 @@ ERROR HY000: Variable 'sync_binlog' is a GLOBAL variable and should be set with disconnect user1; connection default; DROP USER user1@localhost; -# Test that "SET sync_binlog" is allowed with SUPER -CREATE USER user1@localhost; -GRANT SUPER ON *.* TO user1@localhost; -connect user1,localhost,user1,,; -connection user1; -SET GLOBAL sync_binlog=10; -SET sync_binlog=10; -ERROR HY000: Variable 'sync_binlog' is a GLOBAL variable and should be set with SET GLOBAL -SET SESSION sync_binlog=10; -ERROR HY000: Variable 'sync_binlog' is a GLOBAL variable and should be set with SET GLOBAL -disconnect user1; -connection default; -DROP USER user1@localhost; SET @@global.sync_binlog=@global; diff --git a/mysql-test/suite/sys_vars/r/sync_master_info_grant.result b/mysql-test/suite/sys_vars/r/sync_master_info_grant.result index 40b04ea4..6a81685d 100644 --- a/mysql-test/suite/sys_vars/r/sync_master_info_grant.result +++ b/mysql-test/suite/sys_vars/r/sync_master_info_grant.result @@ -2,14 +2,14 @@ # MDEV-21969 Bind REPLICATION SLAVE ADMIN to relay_log_*, sync_master_info, sync_relay_log, sync_relay_log_info # SET @global=@@global.sync_master_info; -# Test that "SET sync_master_info" is not allowed without REPLICATION SLAVE ADMIN or SUPER +# Test that "SET sync_master_info" is not allowed without REPLICATION SLAVE ADMIN CREATE USER user1@localhost; GRANT ALL PRIVILEGES ON *.* TO user1@localhost; -REVOKE REPLICATION SLAVE ADMIN, SUPER ON *.* FROM user1@localhost; +REVOKE REPLICATION SLAVE ADMIN ON *.* FROM user1@localhost; connect user1,localhost,user1,,; connection user1; SET GLOBAL sync_master_info=20000; -ERROR 42000: Access denied; you need (at least one of) the SUPER, REPLICATION SLAVE ADMIN privilege(s) for this operation +ERROR 42000: Access denied; you need (at least one of) the REPLICATION SLAVE ADMIN privilege(s) for this operation SET sync_master_info=20000; ERROR HY000: Variable 'sync_master_info' is a GLOBAL variable and should be set with SET GLOBAL SET SESSION sync_master_info=20000; @@ -30,17 +30,4 @@ ERROR HY000: Variable 'sync_master_info' is a GLOBAL variable and should be set disconnect user1; connection default; DROP USER user1@localhost; -# Test that "SET sync_master_info" is allowed with SUPER -CREATE USER user1@localhost; -GRANT SUPER ON *.* TO user1@localhost; -connect user1,localhost,user1,,; -connection user1; -SET GLOBAL sync_master_info=20000; -SET sync_master_info=20000; -ERROR HY000: Variable 'sync_master_info' is a GLOBAL variable and should be set with SET GLOBAL -SET SESSION sync_master_info=20000; -ERROR HY000: Variable 'sync_master_info' is a GLOBAL variable and should be set with SET GLOBAL -disconnect user1; -connection default; -DROP USER user1@localhost; SET @@global.sync_master_info=@global; diff --git a/mysql-test/suite/sys_vars/r/sync_relay_log_grant.result b/mysql-test/suite/sys_vars/r/sync_relay_log_grant.result index f71e8325..881a7b1f 100644 --- a/mysql-test/suite/sys_vars/r/sync_relay_log_grant.result +++ b/mysql-test/suite/sys_vars/r/sync_relay_log_grant.result @@ -2,14 +2,14 @@ # MDEV-21969 Bind REPLICATION SLAVE ADMIN to relay_log_*, sync_master_info, sync_relay_log, sync_relay_log_info # SET @global=@@global.sync_relay_log; -# Test that "SET sync_relay_log" is not allowed without REPLICATION SLAVE ADMIN or SUPER +# Test that "SET sync_relay_log" is not allowed without REPLICATION SLAVE ADMIN CREATE USER user1@localhost; GRANT ALL PRIVILEGES ON *.* TO user1@localhost; -REVOKE REPLICATION SLAVE ADMIN, SUPER ON *.* FROM user1@localhost; +REVOKE REPLICATION SLAVE ADMIN ON *.* FROM user1@localhost; connect user1,localhost,user1,,; connection user1; SET GLOBAL sync_relay_log=20000; -ERROR 42000: Access denied; you need (at least one of) the SUPER, REPLICATION SLAVE ADMIN privilege(s) for this operation +ERROR 42000: Access denied; you need (at least one of) the REPLICATION SLAVE ADMIN privilege(s) for this operation SET sync_relay_log=20000; ERROR HY000: Variable 'sync_relay_log' is a GLOBAL variable and should be set with SET GLOBAL SET SESSION sync_relay_log=20000; @@ -30,17 +30,4 @@ ERROR HY000: Variable 'sync_relay_log' is a GLOBAL variable and should be set wi disconnect user1; connection default; DROP USER user1@localhost; -# Test that "SET sync_relay_log" is allowed with SUPER -CREATE USER user1@localhost; -GRANT SUPER ON *.* TO user1@localhost; -connect user1,localhost,user1,,; -connection user1; -SET GLOBAL sync_relay_log=20000; -SET sync_relay_log=20000; -ERROR HY000: Variable 'sync_relay_log' is a GLOBAL variable and should be set with SET GLOBAL -SET SESSION sync_relay_log=20000; -ERROR HY000: Variable 'sync_relay_log' is a GLOBAL variable and should be set with SET GLOBAL -disconnect user1; -connection default; -DROP USER user1@localhost; SET @@global.sync_relay_log=@global; diff --git a/mysql-test/suite/sys_vars/r/sync_relay_log_info_grant.result b/mysql-test/suite/sys_vars/r/sync_relay_log_info_grant.result index 25727aac..18eae3fa 100644 --- a/mysql-test/suite/sys_vars/r/sync_relay_log_info_grant.result +++ b/mysql-test/suite/sys_vars/r/sync_relay_log_info_grant.result @@ -2,14 +2,14 @@ # MDEV-21969 Bind REPLICATION SLAVE ADMIN to relay_log_*, sync_master_info, sync_relay_log, sync_relay_log_info # SET @global=@@global.sync_relay_log_info; -# Test that "SET sync_relay_log_info" is not allowed without REPLICATION SLAVE ADMIN or SUPER +# Test that "SET sync_relay_log_info" is not allowed without REPLICATION SLAVE ADMIN CREATE USER user1@localhost; GRANT ALL PRIVILEGES ON *.* TO user1@localhost; -REVOKE REPLICATION SLAVE ADMIN, SUPER ON *.* FROM user1@localhost; +REVOKE REPLICATION SLAVE ADMIN ON *.* FROM user1@localhost; connect user1,localhost,user1,,; connection user1; SET GLOBAL sync_relay_log_info=20000; -ERROR 42000: Access denied; you need (at least one of) the SUPER, REPLICATION SLAVE ADMIN privilege(s) for this operation +ERROR 42000: Access denied; you need (at least one of) the REPLICATION SLAVE ADMIN privilege(s) for this operation SET sync_relay_log_info=20000; ERROR HY000: Variable 'sync_relay_log_info' is a GLOBAL variable and should be set with SET GLOBAL SET SESSION sync_relay_log_info=20000; @@ -30,17 +30,4 @@ ERROR HY000: Variable 'sync_relay_log_info' is a GLOBAL variable and should be s disconnect user1; connection default; DROP USER user1@localhost; -# Test that "SET sync_relay_log_info" is allowed with SUPER -CREATE USER user1@localhost; -GRANT SUPER ON *.* TO user1@localhost; -connect user1,localhost,user1,,; -connection user1; -SET GLOBAL sync_relay_log_info=20000; -SET sync_relay_log_info=20000; -ERROR HY000: Variable 'sync_relay_log_info' is a GLOBAL variable and should be set with SET GLOBAL -SET SESSION sync_relay_log_info=20000; -ERROR HY000: Variable 'sync_relay_log_info' is a GLOBAL variable and should be set with SET GLOBAL -disconnect user1; -connection default; -DROP USER user1@localhost; SET @@global.sync_relay_log_info=@global; diff --git a/mysql-test/suite/sys_vars/r/sysvars_aria,32bit.rdiff b/mysql-test/suite/sys_vars/r/sysvars_aria,32bit.rdiff index 6569d266..f7d64b78 100644 --- a/mysql-test/suite/sys_vars/r/sysvars_aria,32bit.rdiff +++ b/mysql-test/suite/sys_vars/r/sysvars_aria,32bit.rdiff @@ -1,5 +1,5 @@ ---- suite/sys_vars/r/sysvars_aria.result 2021-02-02 02:58:55.686921205 +0200 -+++ suite/sys_vars/r/sysvars_aria,32bit.reject 2021-02-02 10:55:53.876791633 +0200 +--- a/mysql-test/suite/sys_vars/r/sysvars_aria.result ++++ b/mysql-test/suite/sys_vars/r/sysvars_aria.result @@ -5,7 +5,7 @@ SESSION_VALUE NULL DEFAULT_VALUE 8192 @@ -45,7 +45,7 @@ VARIABLE_COMMENT Interval between commits in microseconds (1/1000000 sec). 0 stands for no waiting for other threads to come and do a commit in "hard" mode and no sync()/commit at all in "soft" mode. Option has only an effect if aria_group_commit is used NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 4294967295 -@@ -89,7 +89,7 @@ +@@ -101,7 +101,7 @@ SESSION_VALUE NULL DEFAULT_VALUE 1073741824 VARIABLE_SCOPE GLOBAL @@ -54,7 +54,7 @@ VARIABLE_COMMENT Limit for transaction log size NUMERIC_MIN_VALUE 8388608 NUMERIC_MAX_VALUE 4294967295 -@@ -125,10 +125,10 @@ +@@ -137,10 +137,10 @@ SESSION_VALUE NULL DEFAULT_VALUE 300 VARIABLE_SCOPE GLOBAL @@ -67,7 +67,7 @@ NUMERIC_BLOCK_SIZE 100 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -149,7 +149,7 @@ +@@ -161,7 +161,7 @@ SESSION_VALUE NULL DEFAULT_VALUE 100 VARIABLE_SCOPE GLOBAL @@ -76,7 +76,7 @@ VARIABLE_COMMENT The minimum percentage of warm blocks in key cache NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 100 -@@ -161,7 +161,7 @@ +@@ -173,7 +173,7 @@ SESSION_VALUE NULL DEFAULT_VALUE 512 VARIABLE_SCOPE GLOBAL @@ -85,7 +85,7 @@ VARIABLE_COMMENT Number of hash buckets for open and changed files. If you have a lot of Aria files open you should increase this for faster flush of changes. A good value is probably 1/10 of number of possible open Aria files. NUMERIC_MIN_VALUE 128 NUMERIC_MAX_VALUE 16384 -@@ -197,7 +197,7 @@ +@@ -209,7 +209,7 @@ SESSION_VALUE 1 DEFAULT_VALUE 1 VARIABLE_SCOPE SESSION @@ -94,7 +94,7 @@ VARIABLE_COMMENT Number of threads to use when repairing Aria tables. The value of 1 disables parallel repair. NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 128 -@@ -212,7 +212,7 @@ +@@ -224,7 +224,7 @@ VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT The buffer that is allocated when sorting the index when doing a REPAIR or when creating indexes with CREATE INDEX or ALTER TABLE. NUMERIC_MIN_VALUE 16376 diff --git a/mysql-test/suite/sys_vars/r/sysvars_debug,32bit.rdiff b/mysql-test/suite/sys_vars/r/sysvars_debug,32bit.rdiff index 8adb294d..50a3bed4 100644 --- a/mysql-test/suite/sys_vars/r/sysvars_debug,32bit.rdiff +++ b/mysql-test/suite/sys_vars/r/sysvars_debug,32bit.rdiff @@ -1,7 +1,7 @@ ---- r\sysvars_debug.result 2017-08-08 10:52:39.036804900 +0300 -+++ r\sysvars_debug,32bit.reject 2017-09-10 08:06:38.447122100 +0300 -@@ -21,7 +21,7 @@ - GLOBAL_VALUE_ORIGIN CONFIG +--- a/mysql-test/suite/sys_vars/r/sysvars_debug.result ++++ b/mysql-test/suite/sys_vars/r/sysvars_debug.result +@@ -22,7 +22,7 @@ + GLOBAL_VALUE_ORIGIN COMMAND-LINE DEFAULT_VALUE 0 VARIABLE_SCOPE GLOBAL -VARIABLE_TYPE BIGINT UNSIGNED diff --git a/mysql-test/suite/sys_vars/r/sysvars_debug.result b/mysql-test/suite/sys_vars/r/sysvars_debug.result index 01f74170..37f03aee 100644 --- a/mysql-test/suite/sys_vars/r/sysvars_debug.result +++ b/mysql-test/suite/sys_vars/r/sysvars_debug.result @@ -61,21 +61,6 @@ ENUM_VALUE_LIST OFF,ON READ_ONLY YES COMMAND_LINE_ARGUMENT OPTIONAL GLOBAL_VALUE_PATH NULL -VARIABLE_NAME DEBUG_NO_THREAD_ALARM -SESSION_VALUE NULL -GLOBAL_VALUE OFF -GLOBAL_VALUE_ORIGIN COMPILE-TIME -DEFAULT_VALUE OFF -VARIABLE_SCOPE GLOBAL -VARIABLE_TYPE BOOLEAN -VARIABLE_COMMENT Disable system thread alarm calls. Disabling it may be useful in debugging or testing, never do it in production -NUMERIC_MIN_VALUE NULL -NUMERIC_MAX_VALUE NULL -NUMERIC_BLOCK_SIZE NULL -ENUM_VALUE_LIST OFF,ON -READ_ONLY YES -COMMAND_LINE_ARGUMENT OPTIONAL -GLOBAL_VALUE_PATH NULL VARIABLE_NAME DEBUG_SYNC SESSION_VALUE ON - current signals: '' GLOBAL_VALUE NULL diff --git a/mysql-test/suite/sys_vars/r/sysvars_innodb.result b/mysql-test/suite/sys_vars/r/sysvars_innodb.result index 6a7e184f..cfd035be 100644 --- a/mysql-test/suite/sys_vars/r/sysvars_innodb.result +++ b/mysql-test/suite/sys_vars/r/sysvars_innodb.result @@ -223,54 +223,6 @@ NUMERIC_BLOCK_SIZE NULL ENUM_VALUE_LIST OFF,ON READ_ONLY NO COMMAND_LINE_ARGUMENT OPTIONAL -VARIABLE_NAME INNODB_CHANGE_BUFFERING -SESSION_VALUE NULL -DEFAULT_VALUE none -VARIABLE_SCOPE GLOBAL -VARIABLE_TYPE ENUM -VARIABLE_COMMENT Buffer changes to secondary indexes. -NUMERIC_MIN_VALUE NULL -NUMERIC_MAX_VALUE NULL -NUMERIC_BLOCK_SIZE NULL -ENUM_VALUE_LIST none,inserts,deletes,changes,purges,all -READ_ONLY NO -COMMAND_LINE_ARGUMENT REQUIRED -VARIABLE_NAME INNODB_CHANGE_BUFFERING_DEBUG -SESSION_VALUE NULL -DEFAULT_VALUE 0 -VARIABLE_SCOPE GLOBAL -VARIABLE_TYPE INT UNSIGNED -VARIABLE_COMMENT Debug flags for InnoDB change buffering (0=none, 1=try to buffer) -NUMERIC_MIN_VALUE 0 -NUMERIC_MAX_VALUE 1 -NUMERIC_BLOCK_SIZE 0 -ENUM_VALUE_LIST NULL -READ_ONLY NO -COMMAND_LINE_ARGUMENT REQUIRED -VARIABLE_NAME INNODB_CHANGE_BUFFER_DUMP -SESSION_VALUE NULL -DEFAULT_VALUE OFF -VARIABLE_SCOPE GLOBAL -VARIABLE_TYPE BOOLEAN -VARIABLE_COMMENT Dump the change buffer at startup. -NUMERIC_MIN_VALUE NULL -NUMERIC_MAX_VALUE NULL -NUMERIC_BLOCK_SIZE NULL -ENUM_VALUE_LIST OFF,ON -READ_ONLY YES -COMMAND_LINE_ARGUMENT NONE -VARIABLE_NAME INNODB_CHANGE_BUFFER_MAX_SIZE -SESSION_VALUE NULL -DEFAULT_VALUE 25 -VARIABLE_SCOPE GLOBAL -VARIABLE_TYPE INT UNSIGNED -VARIABLE_COMMENT Maximum on-disk size of change buffer in terms of percentage of the buffer pool. -NUMERIC_MIN_VALUE 0 -NUMERIC_MAX_VALUE 50 -NUMERIC_BLOCK_SIZE 0 -ENUM_VALUE_LIST NULL -READ_ONLY NO -COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME INNODB_CHECKSUM_ALGORITHM SESSION_VALUE NULL DEFAULT_VALUE full_crc32 @@ -355,6 +307,18 @@ NUMERIC_BLOCK_SIZE 0 ENUM_VALUE_LIST NULL READ_ONLY NO COMMAND_LINE_ARGUMENT OPTIONAL +VARIABLE_NAME INNODB_DATA_FILE_BUFFERING +SESSION_VALUE NULL +DEFAULT_VALUE OFF +VARIABLE_SCOPE GLOBAL +VARIABLE_TYPE BOOLEAN +VARIABLE_COMMENT Whether the file system cache for data files is enabled +NUMERIC_MIN_VALUE NULL +NUMERIC_MAX_VALUE NULL +NUMERIC_BLOCK_SIZE NULL +ENUM_VALUE_LIST OFF,ON +READ_ONLY NO +COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME INNODB_DATA_FILE_PATH SESSION_VALUE NULL DEFAULT_VALUE ibdata1:12M:autoextend @@ -379,6 +343,18 @@ NUMERIC_BLOCK_SIZE 0 ENUM_VALUE_LIST NULL READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED +VARIABLE_NAME INNODB_DATA_FILE_WRITE_THROUGH +SESSION_VALUE NULL +DEFAULT_VALUE OFF +VARIABLE_SCOPE GLOBAL +VARIABLE_TYPE BOOLEAN +VARIABLE_COMMENT Whether each write to data files writes through +NUMERIC_MIN_VALUE NULL +NUMERIC_MAX_VALUE NULL +NUMERIC_BLOCK_SIZE NULL +ENUM_VALUE_LIST OFF,ON +READ_ONLY NO +COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME INNODB_DATA_HOME_DIR SESSION_VALUE NULL DEFAULT_VALUE @@ -439,78 +415,6 @@ NUMERIC_BLOCK_SIZE NULL ENUM_VALUE_LIST redundant,compact,dynamic READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED -VARIABLE_NAME INNODB_DEFRAGMENT -SESSION_VALUE NULL -DEFAULT_VALUE OFF -VARIABLE_SCOPE GLOBAL -VARIABLE_TYPE BOOLEAN -VARIABLE_COMMENT Enable/disable InnoDB defragmentation (default FALSE). When set to FALSE, all existing defragmentation will be paused. And new defragmentation command will fail.Paused defragmentation commands will resume when this variable is set to true again. -NUMERIC_MIN_VALUE NULL -NUMERIC_MAX_VALUE NULL -NUMERIC_BLOCK_SIZE NULL -ENUM_VALUE_LIST OFF,ON -READ_ONLY NO -COMMAND_LINE_ARGUMENT REQUIRED -VARIABLE_NAME INNODB_DEFRAGMENT_FILL_FACTOR -SESSION_VALUE NULL -DEFAULT_VALUE 0.900000 -VARIABLE_SCOPE GLOBAL -VARIABLE_TYPE DOUBLE -VARIABLE_COMMENT A number between [0.7, 1] that tells defragmentation how full it should fill a page. Default is 0.9. Number below 0.7 won't make much sense.This variable, together with innodb_defragment_fill_factor_n_recs, is introduced so defragmentation won't pack the page too full and cause page split on the next insert on every page. The variable indicating more defragmentation gain is the one effective. -NUMERIC_MIN_VALUE 0.7 -NUMERIC_MAX_VALUE 1 -NUMERIC_BLOCK_SIZE NULL -ENUM_VALUE_LIST NULL -READ_ONLY NO -COMMAND_LINE_ARGUMENT REQUIRED -VARIABLE_NAME INNODB_DEFRAGMENT_FILL_FACTOR_N_RECS -SESSION_VALUE NULL -DEFAULT_VALUE 20 -VARIABLE_SCOPE GLOBAL -VARIABLE_TYPE INT UNSIGNED -VARIABLE_COMMENT How many records of space defragmentation should leave on the page. This variable, together with innodb_defragment_fill_factor, is introduced so defragmentation won't pack the page too full and cause page split on the next insert on every page. The variable indicating more defragmentation gain is the one effective. -NUMERIC_MIN_VALUE 1 -NUMERIC_MAX_VALUE 100 -NUMERIC_BLOCK_SIZE 0 -ENUM_VALUE_LIST NULL -READ_ONLY NO -COMMAND_LINE_ARGUMENT REQUIRED -VARIABLE_NAME INNODB_DEFRAGMENT_FREQUENCY -SESSION_VALUE NULL -DEFAULT_VALUE 40 -VARIABLE_SCOPE GLOBAL -VARIABLE_TYPE INT UNSIGNED -VARIABLE_COMMENT Do not defragment a single index more than this number of time per second.This controls the number of time defragmentation thread can request X_LOCK on an index. Defragmentation thread will check whether 1/defragment_frequency (s) has passed since it worked on this index last time, and put the index back to the queue if not enough time has passed. The actual frequency can only be lower than this given number. -NUMERIC_MIN_VALUE 1 -NUMERIC_MAX_VALUE 1000 -NUMERIC_BLOCK_SIZE 0 -ENUM_VALUE_LIST NULL -READ_ONLY NO -COMMAND_LINE_ARGUMENT REQUIRED -VARIABLE_NAME INNODB_DEFRAGMENT_N_PAGES -SESSION_VALUE NULL -DEFAULT_VALUE 7 -VARIABLE_SCOPE GLOBAL -VARIABLE_TYPE INT UNSIGNED -VARIABLE_COMMENT Number of pages considered at once when merging multiple pages to defragment -NUMERIC_MIN_VALUE 2 -NUMERIC_MAX_VALUE 32 -NUMERIC_BLOCK_SIZE 0 -ENUM_VALUE_LIST NULL -READ_ONLY NO -COMMAND_LINE_ARGUMENT REQUIRED -VARIABLE_NAME INNODB_DEFRAGMENT_STATS_ACCURACY -SESSION_VALUE NULL -DEFAULT_VALUE 0 -VARIABLE_SCOPE GLOBAL -VARIABLE_TYPE INT UNSIGNED -VARIABLE_COMMENT How many defragment stats changes there are before the stats are written to persistent storage. Set to 0 meaning disable defragment stats tracking. -NUMERIC_MIN_VALUE 0 -NUMERIC_MAX_VALUE 4294967295 -NUMERIC_BLOCK_SIZE 0 -ENUM_VALUE_LIST NULL -READ_ONLY NO -COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME INNODB_DISABLE_SORT_FILE_CACHE SESSION_VALUE NULL DEFAULT_VALUE OFF @@ -527,14 +431,14 @@ VARIABLE_NAME INNODB_DOUBLEWRITE SESSION_VALUE NULL DEFAULT_VALUE ON VARIABLE_SCOPE GLOBAL -VARIABLE_TYPE BOOLEAN -VARIABLE_COMMENT Enable InnoDB doublewrite buffer (enabled by default). Disable with --skip-innodb-doublewrite. +VARIABLE_TYPE ENUM +VARIABLE_COMMENT Whether and how to use the doublewrite buffer. OFF=Assume that writes of innodb_page_size are atomic; ON=Prevent torn writes (the default); fast=Like ON, but do not synchronize writes to data files NUMERIC_MIN_VALUE NULL NUMERIC_MAX_VALUE NULL NUMERIC_BLOCK_SIZE NULL -ENUM_VALUE_LIST OFF,ON -READ_ONLY YES -COMMAND_LINE_ARGUMENT NONE +ENUM_VALUE_LIST OFF,ON,fast +READ_ONLY NO +COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME INNODB_ENCRYPTION_ROTATE_KEY_AGE SESSION_VALUE NULL DEFAULT_VALUE 1 @@ -1015,6 +919,18 @@ NUMERIC_BLOCK_SIZE 4096 ENUM_VALUE_LIST NULL READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED +VARIABLE_NAME INNODB_LOG_FILE_WRITE_THROUGH +SESSION_VALUE NULL +DEFAULT_VALUE OFF +VARIABLE_SCOPE GLOBAL +VARIABLE_TYPE BOOLEAN +VARIABLE_COMMENT Whether each write to ib_logfile0 is write through +NUMERIC_MIN_VALUE NULL +NUMERIC_MAX_VALUE NULL +NUMERIC_BLOCK_SIZE NULL +ENUM_VALUE_LIST OFF,ON +READ_ONLY NO +COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME INNODB_LOG_GROUP_HOME_DIR SESSION_VALUE NULL DEFAULT_VALUE @@ -1639,6 +1555,18 @@ NUMERIC_BLOCK_SIZE NULL ENUM_VALUE_LIST NULL READ_ONLY NO COMMAND_LINE_ARGUMENT OPTIONAL +VARIABLE_NAME INNODB_TRUNCATE_TEMPORARY_TABLESPACE_NOW +SESSION_VALUE NULL +DEFAULT_VALUE OFF +VARIABLE_SCOPE GLOBAL +VARIABLE_TYPE BOOLEAN +VARIABLE_COMMENT Shrink the temporary tablespace +NUMERIC_MIN_VALUE NULL +NUMERIC_MAX_VALUE NULL +NUMERIC_BLOCK_SIZE NULL +ENUM_VALUE_LIST OFF,ON +READ_ONLY NO +COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME INNODB_TRX_PURGE_VIEW_UPDATE_ONLY_DEBUG SESSION_VALUE NULL DEFAULT_VALUE OFF @@ -1689,7 +1617,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME INNODB_UNDO_TABLESPACES SESSION_VALUE NULL -DEFAULT_VALUE 0 +DEFAULT_VALUE 3 VARIABLE_SCOPE GLOBAL VARIABLE_TYPE INT UNSIGNED VARIABLE_COMMENT Number of undo tablespaces to use. diff --git a/mysql-test/suite/sys_vars/r/sysvars_server_embedded,32bit.rdiff b/mysql-test/suite/sys_vars/r/sysvars_server_embedded,32bit.rdiff index e7621986..771fa906 100644 --- a/mysql-test/suite/sys_vars/r/sysvars_server_embedded,32bit.rdiff +++ b/mysql-test/suite/sys_vars/r/sysvars_server_embedded,32bit.rdiff @@ -1,5 +1,5 @@ ---- sysvars_server_embedded.result 2024-01-24 07:43:25.510260081 +0100 -+++ sysvars_server_embedded,32bit.result 2024-01-28 18:07:02.851488186 +0100 +--- sysvars_server_embedded.result 2024-02-15 09:34:10.105925200 +0100 ++++ sysvars_server_embedded,32bit.result 2024-02-15 13:49:05.823558727 +0100 @@ -44,7 +44,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME ARIA_BLOCK_SIZE @@ -182,7 +182,7 @@ NUMERIC_BLOCK_SIZE 4096 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -467,7 +467,7 @@ +@@ -507,7 +507,7 @@ VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT The size of the statement cache for updates to non-transactional engines for the binary log. If you often use statements updating a great number of rows, you can increase this to get more performance. NUMERIC_MIN_VALUE 4096 @@ -191,7 +191,7 @@ NUMERIC_BLOCK_SIZE 4096 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -477,7 +477,7 @@ +@@ -527,7 +527,7 @@ VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT Size of tree cache used in bulk insert optimisation. Note that this is a limit per thread! NUMERIC_MIN_VALUE 0 @@ -200,7 +200,7 @@ NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -664,7 +664,7 @@ +@@ -724,7 +724,7 @@ COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME CONNECT_TIMEOUT VARIABLE_SCOPE GLOBAL @@ -209,7 +209,7 @@ VARIABLE_COMMENT The number of seconds the mysqld server is waiting for a connect packet before responding with 'Bad handshake' NUMERIC_MIN_VALUE 2 NUMERIC_MAX_VALUE 31536000 -@@ -714,7 +714,7 @@ +@@ -754,7 +754,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME DEADLOCK_SEARCH_DEPTH_LONG VARIABLE_SCOPE SESSION @@ -218,7 +218,7 @@ VARIABLE_COMMENT Long search depth for the two-step deadlock detection NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 33 -@@ -724,7 +724,7 @@ +@@ -764,7 +764,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME DEADLOCK_SEARCH_DEPTH_SHORT VARIABLE_SCOPE SESSION @@ -227,7 +227,7 @@ VARIABLE_COMMENT Short search depth for the two-step deadlock detection NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 32 -@@ -734,7 +734,7 @@ +@@ -774,7 +774,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME DEADLOCK_TIMEOUT_LONG VARIABLE_SCOPE SESSION @@ -236,7 +236,7 @@ VARIABLE_COMMENT Long timeout for the two-step deadlock detection (in microseconds) NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 4294967295 -@@ -744,7 +744,7 @@ +@@ -784,7 +784,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME DEADLOCK_TIMEOUT_SHORT VARIABLE_SCOPE SESSION @@ -245,7 +245,7 @@ VARIABLE_COMMENT Short timeout for the two-step deadlock detection (in microseconds) NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 4294967295 -@@ -794,7 +794,7 @@ +@@ -834,7 +834,7 @@ COMMAND_LINE_ARGUMENT NULL VARIABLE_NAME DEFAULT_WEEK_FORMAT VARIABLE_SCOPE SESSION @@ -254,7 +254,7 @@ VARIABLE_COMMENT The default week format used by WEEK() functions NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 7 -@@ -804,7 +804,7 @@ +@@ -844,7 +844,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME DELAYED_INSERT_LIMIT VARIABLE_SCOPE GLOBAL @@ -263,7 +263,7 @@ VARIABLE_COMMENT After inserting delayed_insert_limit rows, the INSERT DELAYED handler will check if there are any SELECT statements pending. If so, it allows these to execute before continuing. NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 4294967295 -@@ -814,7 +814,7 @@ +@@ -854,7 +854,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME DELAYED_INSERT_TIMEOUT VARIABLE_SCOPE GLOBAL @@ -272,7 +272,7 @@ VARIABLE_COMMENT How long a INSERT DELAYED thread should wait for INSERT statements before terminating NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 31536000 -@@ -824,7 +824,7 @@ +@@ -864,7 +864,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME DELAYED_QUEUE_SIZE VARIABLE_SCOPE GLOBAL @@ -281,7 +281,7 @@ VARIABLE_COMMENT What size queue (in rows) should be allocated for handling INSERT DELAYED. If the queue becomes full, any client that does INSERT DELAYED will wait until there is room in the queue again NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 4294967295 -@@ -854,7 +854,7 @@ +@@ -894,7 +894,7 @@ COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME DIV_PRECISION_INCREMENT VARIABLE_SCOPE SESSION @@ -290,7 +290,7 @@ VARIABLE_COMMENT Precision of the result of '/' operator will be increased on that value NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 38 -@@ -964,7 +964,7 @@ +@@ -1004,7 +1004,7 @@ COMMAND_LINE_ARGUMENT NULL VARIABLE_NAME EXTRA_MAX_CONNECTIONS VARIABLE_SCOPE GLOBAL @@ -299,7 +299,7 @@ VARIABLE_COMMENT The number of connections on extra-port NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 100000 -@@ -994,7 +994,7 @@ +@@ -1034,7 +1034,7 @@ COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME FLUSH_TIME VARIABLE_SCOPE GLOBAL @@ -308,7 +308,7 @@ VARIABLE_COMMENT A dedicated thread is created to flush all tables at the given interval NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 31536000 -@@ -1024,7 +1024,7 @@ +@@ -1064,7 +1064,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME FT_MAX_WORD_LEN VARIABLE_SCOPE GLOBAL @@ -317,7 +317,7 @@ VARIABLE_COMMENT The maximum length of the word to be included in a FULLTEXT index. Note: FULLTEXT indexes must be rebuilt after changing this variable NUMERIC_MIN_VALUE 10 NUMERIC_MAX_VALUE 84 -@@ -1034,7 +1034,7 @@ +@@ -1074,7 +1074,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME FT_MIN_WORD_LEN VARIABLE_SCOPE GLOBAL @@ -326,7 +326,7 @@ VARIABLE_COMMENT The minimum length of the word to be included in a FULLTEXT index. Note: FULLTEXT indexes must be rebuilt after changing this variable NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 84 -@@ -1044,7 +1044,7 @@ +@@ -1084,7 +1084,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME FT_QUERY_EXPANSION_LIMIT VARIABLE_SCOPE GLOBAL @@ -335,7 +335,7 @@ VARIABLE_COMMENT Number of best matches to use for query expansion NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 1000 -@@ -1214,7 +1214,7 @@ +@@ -1254,7 +1254,7 @@ COMMAND_LINE_ARGUMENT NULL VARIABLE_NAME HISTOGRAM_SIZE VARIABLE_SCOPE SESSION @@ -344,7 +344,7 @@ VARIABLE_COMMENT Number of bytes used for a histogram. If set to 0, no histograms are created by ANALYZE. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 255 -@@ -1244,7 +1244,7 @@ +@@ -1284,7 +1284,7 @@ COMMAND_LINE_ARGUMENT NULL VARIABLE_NAME HOST_CACHE_SIZE VARIABLE_SCOPE GLOBAL @@ -353,7 +353,7 @@ VARIABLE_COMMENT How many host names should be cached to avoid resolving. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 65536 -@@ -1354,7 +1354,7 @@ +@@ -1394,7 +1394,7 @@ COMMAND_LINE_ARGUMENT NULL VARIABLE_NAME INTERACTIVE_TIMEOUT VARIABLE_SCOPE SESSION @@ -362,7 +362,7 @@ VARIABLE_COMMENT The number of seconds the server waits for activity on an interactive connection before closing it NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 31536000 -@@ -1387,7 +1387,7 @@ +@@ -1427,7 +1427,7 @@ VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT The size of the buffer that is used for joins NUMERIC_MIN_VALUE 128 @@ -371,7 +371,7 @@ NUMERIC_BLOCK_SIZE 128 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -1404,7 +1404,7 @@ +@@ -1444,7 +1444,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME JOIN_CACHE_LEVEL VARIABLE_SCOPE SESSION @@ -380,7 +380,7 @@ VARIABLE_COMMENT Controls what join operations can be executed with join buffers. Odd numbers are used for plain join buffers while even numbers are used for linked buffers NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 8 -@@ -1427,7 +1427,7 @@ +@@ -1467,7 +1467,7 @@ VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT The size of the buffer used for index blocks for MyISAM tables. Increase this to get better index handling (for all reads and multiple writes) to as much as you can afford NUMERIC_MIN_VALUE 0 @@ -389,7 +389,7 @@ NUMERIC_BLOCK_SIZE 4096 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -1584,7 +1584,7 @@ +@@ -1624,7 +1624,7 @@ COMMAND_LINE_ARGUMENT NULL VARIABLE_NAME LOCK_WAIT_TIMEOUT VARIABLE_SCOPE SESSION @@ -398,7 +398,7 @@ VARIABLE_COMMENT Timeout in seconds to wait for a lock before returning an error. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 31536000 -@@ -1704,7 +1704,7 @@ +@@ -1744,7 +1744,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME LOG_SLOW_MAX_WARNINGS VARIABLE_SCOPE SESSION @@ -407,7 +407,7 @@ VARIABLE_COMMENT Max numbers of warnings printed to slow query log per statement NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 1000 -@@ -1714,7 +1714,7 @@ +@@ -1754,7 +1754,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME LOG_SLOW_MIN_EXAMINED_ROW_LIMIT VARIABLE_SCOPE SESSION @@ -416,7 +416,7 @@ VARIABLE_COMMENT Don't write queries to slow log that examine fewer rows than that NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 4294967295 -@@ -1754,7 +1754,7 @@ +@@ -1794,7 +1794,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME LOG_SLOW_RATE_LIMIT VARIABLE_SCOPE SESSION @@ -425,7 +425,7 @@ VARIABLE_COMMENT Write to slow log every #th slow query. Set to 1 to log everything. Increase it to reduce the size of the slow or the performance impact of slow logging NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 4294967295 -@@ -1784,7 +1784,7 @@ +@@ -1824,7 +1824,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME LOG_WARNINGS VARIABLE_SCOPE SESSION @@ -434,7 +434,7 @@ VARIABLE_COMMENT Log some non critical warnings to the error log.Value can be between 0 and 11. Higher values mean more verbosity NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 4294967295 -@@ -1834,7 +1834,7 @@ +@@ -1874,7 +1874,7 @@ COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME MAX_ALLOWED_PACKET VARIABLE_SCOPE SESSION @@ -443,7 +443,7 @@ VARIABLE_COMMENT Max packet length to send to or receive from the server NUMERIC_MIN_VALUE 1024 NUMERIC_MAX_VALUE 1073741824 -@@ -1847,14 +1847,14 @@ +@@ -1887,14 +1887,14 @@ VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT Sets the total size of the transactional cache NUMERIC_MIN_VALUE 4096 @@ -460,7 +460,7 @@ VARIABLE_COMMENT Binary log will be rotated automatically when the size exceeds this value. NUMERIC_MIN_VALUE 4096 NUMERIC_MAX_VALUE 1073741824 -@@ -1867,14 +1867,14 @@ +@@ -1907,7 +1907,7 @@ VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT Sets the total size of the statement cache NUMERIC_MIN_VALUE 4096 @@ -469,6 +469,7 @@ NUMERIC_BLOCK_SIZE 4096 ENUM_VALUE_LIST NULL READ_ONLY NO +@@ -1924,7 +1924,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME MAX_CONNECTIONS VARIABLE_SCOPE GLOBAL @@ -477,7 +478,7 @@ VARIABLE_COMMENT The number of simultaneous clients allowed NUMERIC_MIN_VALUE 10 NUMERIC_MAX_VALUE 100000 -@@ -1884,7 +1884,7 @@ +@@ -1934,7 +1934,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME MAX_CONNECT_ERRORS VARIABLE_SCOPE GLOBAL @@ -486,7 +487,7 @@ VARIABLE_COMMENT If there is more than this number of interrupted connections from a host this host will be blocked from further connections NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 4294967295 -@@ -1894,7 +1894,7 @@ +@@ -1944,7 +1944,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME MAX_DELAYED_THREADS VARIABLE_SCOPE SESSION @@ -495,7 +496,7 @@ VARIABLE_COMMENT Don't start more than this number of threads to handle INSERT DELAYED statements. If set to zero INSERT DELAYED will be not used NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 16384 -@@ -1914,7 +1914,7 @@ +@@ -1964,7 +1964,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME MAX_ERROR_COUNT VARIABLE_SCOPE SESSION @@ -504,7 +505,7 @@ VARIABLE_COMMENT Max number of errors/warnings to store for a statement NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 65535 -@@ -1927,14 +1927,14 @@ +@@ -1977,14 +1977,14 @@ VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT Don't allow creation of heap tables bigger than this NUMERIC_MIN_VALUE 16384 @@ -521,7 +522,7 @@ VARIABLE_COMMENT Alias for max_delayed_threads. Don't start more than this number of threads to handle INSERT DELAYED statements. If set to zero INSERT DELAYED will be not used NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 16384 -@@ -1954,7 +1954,7 @@ +@@ -2004,7 +2004,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME MAX_LENGTH_FOR_SORT_DATA VARIABLE_SCOPE SESSION @@ -530,7 +531,7 @@ VARIABLE_COMMENT Max number of bytes in sorted records NUMERIC_MIN_VALUE 4 NUMERIC_MAX_VALUE 8388608 -@@ -1984,7 +1984,7 @@ +@@ -2034,7 +2034,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME MAX_RECURSIVE_ITERATIONS VARIABLE_SCOPE SESSION @@ -539,7 +540,7 @@ VARIABLE_COMMENT Maximum number of iterations when executing recursive queries NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 4294967295 -@@ -1997,14 +1997,14 @@ +@@ -2047,14 +2047,14 @@ VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT The maximum size of the container of a rowid filter NUMERIC_MIN_VALUE 1024 @@ -556,7 +557,7 @@ VARIABLE_COMMENT Limit assumed max number of seeks when looking up rows based on a key NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 4294967295 -@@ -2024,7 +2024,7 @@ +@@ -2074,7 +2074,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME MAX_SORT_LENGTH VARIABLE_SCOPE SESSION @@ -565,7 +566,7 @@ VARIABLE_COMMENT The number of bytes to use when sorting BLOB or TEXT values (only the first max_sort_length bytes of each value are used; the rest are ignored) NUMERIC_MIN_VALUE 64 NUMERIC_MAX_VALUE 8388608 -@@ -2034,7 +2034,7 @@ +@@ -2084,7 +2084,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME MAX_SP_RECURSION_DEPTH VARIABLE_SCOPE SESSION @@ -574,16 +575,7 @@ VARIABLE_COMMENT Maximum stored procedure recursion depth NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 255 -@@ -2054,7 +2054,7 @@ - COMMAND_LINE_ARGUMENT REQUIRED - VARIABLE_NAME MAX_TMP_TABLES - VARIABLE_SCOPE SESSION --VARIABLE_TYPE BIGINT UNSIGNED -+VARIABLE_TYPE INT UNSIGNED - VARIABLE_COMMENT Unused, will be removed. - NUMERIC_MIN_VALUE 1 - NUMERIC_MAX_VALUE 4294967295 -@@ -2074,7 +2074,7 @@ +@@ -2114,7 +2114,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME MAX_WRITE_LOCK_COUNT VARIABLE_SCOPE GLOBAL @@ -592,7 +584,7 @@ VARIABLE_COMMENT After this many write locks, allow some read locks to run in between NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 4294967295 -@@ -2084,7 +2084,7 @@ +@@ -2124,7 +2124,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME METADATA_LOCKS_CACHE_SIZE VARIABLE_SCOPE GLOBAL @@ -601,7 +593,7 @@ VARIABLE_COMMENT Unused NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 1048576 -@@ -2094,7 +2094,7 @@ +@@ -2134,7 +2134,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME METADATA_LOCKS_HASH_INSTANCES VARIABLE_SCOPE GLOBAL @@ -610,7 +602,7 @@ VARIABLE_COMMENT Unused NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 1024 -@@ -2104,7 +2104,7 @@ +@@ -2144,7 +2144,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME MIN_EXAMINED_ROW_LIMIT VARIABLE_SCOPE SESSION @@ -619,7 +611,7 @@ VARIABLE_COMMENT Alias for log_slow_min_examined_row_limit. Don't write queries to slow log that examine fewer rows than that NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 4294967295 -@@ -2114,7 +2114,7 @@ +@@ -2154,7 +2154,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME MRR_BUFFER_SIZE VARIABLE_SCOPE SESSION @@ -628,7 +620,7 @@ VARIABLE_COMMENT Size of buffer to use when using MRR with range access NUMERIC_MIN_VALUE 8192 NUMERIC_MAX_VALUE 2147483647 -@@ -2124,7 +2124,7 @@ +@@ -2164,7 +2164,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME MYISAM_BLOCK_SIZE VARIABLE_SCOPE GLOBAL @@ -637,7 +629,7 @@ VARIABLE_COMMENT Block size to be used for MyISAM index pages NUMERIC_MIN_VALUE 1024 NUMERIC_MAX_VALUE 16384 -@@ -2134,7 +2134,7 @@ +@@ -2174,7 +2174,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME MYISAM_DATA_POINTER_SIZE VARIABLE_SCOPE GLOBAL @@ -646,7 +638,7 @@ VARIABLE_COMMENT Default pointer size to be used for MyISAM tables NUMERIC_MIN_VALUE 2 NUMERIC_MAX_VALUE 7 -@@ -2157,7 +2157,7 @@ +@@ -2197,7 +2197,7 @@ VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT Restricts the total memory used for memory mapping of MySQL tables NUMERIC_MIN_VALUE 7 @@ -655,7 +647,7 @@ NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL READ_ONLY YES -@@ -2174,10 +2174,10 @@ +@@ -2214,10 +2214,10 @@ COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME MYISAM_REPAIR_THREADS VARIABLE_SCOPE SESSION @@ -668,7 +660,7 @@ NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -2187,7 +2187,7 @@ +@@ -2227,7 +2227,7 @@ VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT The buffer that is allocated when sorting the index when doing a REPAIR or when creating indexes with CREATE INDEX or ALTER TABLE NUMERIC_MIN_VALUE 4096 @@ -677,7 +669,7 @@ NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -2224,7 +2224,7 @@ +@@ -2264,7 +2264,7 @@ COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME NET_BUFFER_LENGTH VARIABLE_SCOPE SESSION @@ -686,7 +678,7 @@ VARIABLE_COMMENT Buffer length for TCP/IP and socket communication NUMERIC_MIN_VALUE 1024 NUMERIC_MAX_VALUE 1048576 -@@ -2234,7 +2234,7 @@ +@@ -2274,7 +2274,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME NET_READ_TIMEOUT VARIABLE_SCOPE SESSION @@ -695,7 +687,7 @@ VARIABLE_COMMENT Number of seconds to wait for more data from a connection before aborting the read NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 31536000 -@@ -2244,7 +2244,7 @@ +@@ -2284,7 +2284,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME NET_RETRY_COUNT VARIABLE_SCOPE SESSION @@ -704,7 +696,7 @@ VARIABLE_COMMENT If a read on a communication port is interrupted, retry this many times before giving up NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 4294967295 -@@ -2254,7 +2254,7 @@ +@@ -2294,7 +2294,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME NET_WRITE_TIMEOUT VARIABLE_SCOPE SESSION @@ -713,7 +705,7 @@ VARIABLE_COMMENT Number of seconds to wait for a block to be written to a connection before aborting the write NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 31536000 -@@ -2314,7 +2314,7 @@ +@@ -2344,7 +2344,7 @@ COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME OPEN_FILES_LIMIT VARIABLE_SCOPE GLOBAL @@ -722,16 +714,16 @@ VARIABLE_COMMENT If this is not 0, then mysqld will use this value to reserve file descriptors to use with setrlimit(). If this value is 0 or autoset then mysqld will reserve max_connections*5 or max_connections + table_cache*2 (whichever is larger) number of file descriptors NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 4294967295 -@@ -2324,7 +2324,7 @@ +@@ -2354,7 +2354,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME OPTIMIZER_ADJUST_SECONDARY_KEY_COSTS VARIABLE_SCOPE SESSION -VARIABLE_TYPE BIGINT UNSIGNED +VARIABLE_TYPE INT UNSIGNED - VARIABLE_COMMENT 0 = No changes. 1 = Update secondary key costs for ranges to be at least 5x of clustered primary key costs. 2 = Remove 'max_seek optimization' for secondary keys and slight adjustment of filter cost. This option will be deleted in MariaDB 11.0 as it is not needed with the new 11.0 optimizer. + VARIABLE_COMMENT Unused, will be removed. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 2 -@@ -2334,7 +2334,7 @@ +@@ -2384,7 +2384,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME OPTIMIZER_EXTRA_PRUNING_DEPTH VARIABLE_SCOPE SESSION @@ -740,7 +732,7 @@ VARIABLE_COMMENT If the optimizer needs to enumerate join prefix of this size or larger, then it will try aggressively prune away the search space. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 62 -@@ -2344,7 +2344,7 @@ +@@ -2444,7 +2444,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME OPTIMIZER_MAX_SEL_ARGS VARIABLE_SCOPE SESSION @@ -749,7 +741,7 @@ VARIABLE_COMMENT The maximum number of SEL_ARG objects created when optimizing a range. If more objects would be needed, the range will not be used by the optimizer. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 4294967295 -@@ -2354,7 +2354,7 @@ +@@ -2454,7 +2454,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME OPTIMIZER_MAX_SEL_ARG_WEIGHT VARIABLE_SCOPE SESSION @@ -758,7 +750,7 @@ VARIABLE_COMMENT The maximum weight of the SEL_ARG graph. Set to 0 for no limit NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 4294967295 -@@ -2364,7 +2364,7 @@ +@@ -2464,7 +2464,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME OPTIMIZER_PRUNE_LEVEL VARIABLE_SCOPE SESSION @@ -767,7 +759,7 @@ VARIABLE_COMMENT Controls the heuristic(s) applied during query optimization to prune less-promising partial plans from the optimizer search space. Meaning: 0 - do not apply any heuristic, thus perform exhaustive search: 1 - prune plans based on cost and number of retrieved rows eq_ref: 2 - prune also if we find an eq_ref chain NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 2 -@@ -2374,7 +2374,7 @@ +@@ -2534,7 +2534,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME OPTIMIZER_SEARCH_DEPTH VARIABLE_SCOPE SESSION @@ -776,7 +768,7 @@ VARIABLE_COMMENT Maximum depth of search performed by the query optimizer. Values larger than the number of relations in a query result in better query plans, but take longer to compile a query. Values smaller than the number of tables in a relation result in faster optimization, but may produce very bad query plans. If set to 0, the system will automatically pick a reasonable value. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 62 -@@ -2384,7 +2384,7 @@ +@@ -2544,7 +2544,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME OPTIMIZER_SELECTIVITY_SAMPLING_LIMIT VARIABLE_SCOPE SESSION @@ -785,7 +777,7 @@ VARIABLE_COMMENT Controls number of record samples to check condition selectivity NUMERIC_MIN_VALUE 10 NUMERIC_MAX_VALUE 4294967295 -@@ -2414,17 +2414,17 @@ +@@ -2574,17 +2574,17 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME OPTIMIZER_TRACE_MAX_MEM_SIZE VARIABLE_SCOPE SESSION @@ -806,7 +798,7 @@ VARIABLE_COMMENT Controls selectivity of which conditions the optimizer takes into account to calculate cardinality of a partial join when it searches for the best execution plan Meaning: 1 - use selectivity of index backed range conditions to calculate the cardinality of a partial join if the last joined table is accessed by full table scan or an index scan, 2 - use selectivity of index backed range conditions to calculate the cardinality of a partial join in any case, 3 - additionally always use selectivity of range conditions that are not backed by any index to calculate the cardinality of a partial join, 4 - use histograms to calculate selectivity of range conditions that are not backed by any index to calculate the cardinality of a partial join.5 - additionally use selectivity of certain non-range predicates calculated on record samples NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 5 -@@ -2444,7 +2444,7 @@ +@@ -2614,7 +2614,7 @@ COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME PERFORMANCE_SCHEMA_ACCOUNTS_SIZE VARIABLE_SCOPE GLOBAL @@ -815,7 +807,7 @@ VARIABLE_COMMENT Maximum number of instrumented user@host accounts. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1048576 -@@ -2454,7 +2454,7 @@ +@@ -2624,7 +2624,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_DIGESTS_SIZE VARIABLE_SCOPE GLOBAL @@ -824,7 +816,7 @@ VARIABLE_COMMENT Size of the statement digest. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1048576 -@@ -2464,7 +2464,7 @@ +@@ -2634,7 +2634,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_EVENTS_STAGES_HISTORY_LONG_SIZE VARIABLE_SCOPE GLOBAL @@ -833,7 +825,7 @@ VARIABLE_COMMENT Number of rows in EVENTS_STAGES_HISTORY_LONG. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1048576 -@@ -2474,7 +2474,7 @@ +@@ -2644,7 +2644,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_EVENTS_STAGES_HISTORY_SIZE VARIABLE_SCOPE GLOBAL @@ -842,7 +834,7 @@ VARIABLE_COMMENT Number of rows per thread in EVENTS_STAGES_HISTORY. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1024 -@@ -2484,7 +2484,7 @@ +@@ -2654,7 +2654,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_EVENTS_STATEMENTS_HISTORY_LONG_SIZE VARIABLE_SCOPE GLOBAL @@ -851,7 +843,7 @@ VARIABLE_COMMENT Number of rows in EVENTS_STATEMENTS_HISTORY_LONG. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1048576 -@@ -2494,7 +2494,7 @@ +@@ -2664,7 +2664,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_EVENTS_STATEMENTS_HISTORY_SIZE VARIABLE_SCOPE GLOBAL @@ -860,7 +852,7 @@ VARIABLE_COMMENT Number of rows per thread in EVENTS_STATEMENTS_HISTORY. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1024 -@@ -2504,7 +2504,7 @@ +@@ -2674,7 +2674,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_EVENTS_TRANSACTIONS_HISTORY_LONG_SIZE VARIABLE_SCOPE GLOBAL @@ -869,7 +861,7 @@ VARIABLE_COMMENT Number of rows in EVENTS_TRANSACTIONS_HISTORY_LONG. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1048576 -@@ -2514,7 +2514,7 @@ +@@ -2684,7 +2684,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_EVENTS_TRANSACTIONS_HISTORY_SIZE VARIABLE_SCOPE GLOBAL @@ -878,7 +870,7 @@ VARIABLE_COMMENT Number of rows per thread in EVENTS_TRANSACTIONS_HISTORY. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1024 -@@ -2524,7 +2524,7 @@ +@@ -2694,7 +2694,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_EVENTS_WAITS_HISTORY_LONG_SIZE VARIABLE_SCOPE GLOBAL @@ -887,7 +879,7 @@ VARIABLE_COMMENT Number of rows in EVENTS_WAITS_HISTORY_LONG. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1048576 -@@ -2534,7 +2534,7 @@ +@@ -2704,7 +2704,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_EVENTS_WAITS_HISTORY_SIZE VARIABLE_SCOPE GLOBAL @@ -896,7 +888,7 @@ VARIABLE_COMMENT Number of rows per thread in EVENTS_WAITS_HISTORY. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1024 -@@ -2544,7 +2544,7 @@ +@@ -2714,7 +2714,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_HOSTS_SIZE VARIABLE_SCOPE GLOBAL @@ -905,7 +897,7 @@ VARIABLE_COMMENT Maximum number of instrumented hosts. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1048576 -@@ -2554,7 +2554,7 @@ +@@ -2724,7 +2724,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_COND_CLASSES VARIABLE_SCOPE GLOBAL @@ -914,7 +906,7 @@ VARIABLE_COMMENT Maximum number of condition instruments. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 256 -@@ -2564,7 +2564,7 @@ +@@ -2734,7 +2734,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_COND_INSTANCES VARIABLE_SCOPE GLOBAL @@ -923,7 +915,7 @@ VARIABLE_COMMENT Maximum number of instrumented condition objects. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1048576 -@@ -2574,7 +2574,7 @@ +@@ -2744,7 +2744,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_DIGEST_LENGTH VARIABLE_SCOPE GLOBAL @@ -932,7 +924,7 @@ VARIABLE_COMMENT Maximum length considered for digest text, when stored in performance_schema tables. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 1048576 -@@ -2584,7 +2584,7 @@ +@@ -2754,7 +2754,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_FILE_CLASSES VARIABLE_SCOPE GLOBAL @@ -941,7 +933,7 @@ VARIABLE_COMMENT Maximum number of file instruments. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 256 -@@ -2594,7 +2594,7 @@ +@@ -2764,7 +2764,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_FILE_HANDLES VARIABLE_SCOPE GLOBAL @@ -950,7 +942,7 @@ VARIABLE_COMMENT Maximum number of opened instrumented files. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 1048576 -@@ -2604,7 +2604,7 @@ +@@ -2774,7 +2774,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_FILE_INSTANCES VARIABLE_SCOPE GLOBAL @@ -959,7 +951,7 @@ VARIABLE_COMMENT Maximum number of instrumented files. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1048576 -@@ -2614,7 +2614,7 @@ +@@ -2784,7 +2784,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_INDEX_STAT VARIABLE_SCOPE GLOBAL @@ -968,7 +960,7 @@ VARIABLE_COMMENT Maximum number of index statistics for instrumented tables. Use 0 to disable, -1 for automated scaling. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1048576 -@@ -2624,7 +2624,7 @@ +@@ -2794,7 +2794,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_MEMORY_CLASSES VARIABLE_SCOPE GLOBAL @@ -977,7 +969,7 @@ VARIABLE_COMMENT Maximum number of memory pool instruments. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 1024 -@@ -2634,7 +2634,7 @@ +@@ -2804,7 +2804,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_METADATA_LOCKS VARIABLE_SCOPE GLOBAL @@ -986,7 +978,7 @@ VARIABLE_COMMENT Maximum number of metadata locks. Use 0 to disable, -1 for automated scaling. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 104857600 -@@ -2644,7 +2644,7 @@ +@@ -2814,7 +2814,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_MUTEX_CLASSES VARIABLE_SCOPE GLOBAL @@ -995,7 +987,7 @@ VARIABLE_COMMENT Maximum number of mutex instruments. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 256 -@@ -2654,7 +2654,7 @@ +@@ -2824,7 +2824,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_MUTEX_INSTANCES VARIABLE_SCOPE GLOBAL @@ -1004,7 +996,7 @@ VARIABLE_COMMENT Maximum number of instrumented MUTEX objects. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 104857600 -@@ -2664,7 +2664,7 @@ +@@ -2834,7 +2834,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_PREPARED_STATEMENTS_INSTANCES VARIABLE_SCOPE GLOBAL @@ -1013,7 +1005,7 @@ VARIABLE_COMMENT Maximum number of instrumented prepared statements. Use 0 to disable, -1 for automated scaling. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1048576 -@@ -2674,7 +2674,7 @@ +@@ -2844,7 +2844,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_PROGRAM_INSTANCES VARIABLE_SCOPE GLOBAL @@ -1022,7 +1014,7 @@ VARIABLE_COMMENT Maximum number of instrumented programs. Use 0 to disable, -1 for automated scaling. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1048576 -@@ -2684,7 +2684,7 @@ +@@ -2854,7 +2854,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_RWLOCK_CLASSES VARIABLE_SCOPE GLOBAL @@ -1031,7 +1023,7 @@ VARIABLE_COMMENT Maximum number of rwlock instruments. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 256 -@@ -2694,7 +2694,7 @@ +@@ -2864,7 +2864,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_RWLOCK_INSTANCES VARIABLE_SCOPE GLOBAL @@ -1040,7 +1032,7 @@ VARIABLE_COMMENT Maximum number of instrumented RWLOCK objects. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 104857600 -@@ -2704,7 +2704,7 @@ +@@ -2874,7 +2874,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_SOCKET_CLASSES VARIABLE_SCOPE GLOBAL @@ -1049,7 +1041,7 @@ VARIABLE_COMMENT Maximum number of socket instruments. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 256 -@@ -2714,7 +2714,7 @@ +@@ -2884,7 +2884,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_SOCKET_INSTANCES VARIABLE_SCOPE GLOBAL @@ -1058,7 +1050,7 @@ VARIABLE_COMMENT Maximum number of opened instrumented sockets. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1048576 -@@ -2724,7 +2724,7 @@ +@@ -2894,7 +2894,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_SQL_TEXT_LENGTH VARIABLE_SCOPE GLOBAL @@ -1067,7 +1059,7 @@ VARIABLE_COMMENT Maximum length of displayed sql text. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 1048576 -@@ -2734,7 +2734,7 @@ +@@ -2904,7 +2904,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_STAGE_CLASSES VARIABLE_SCOPE GLOBAL @@ -1076,7 +1068,7 @@ VARIABLE_COMMENT Maximum number of stage instruments. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 256 -@@ -2744,7 +2744,7 @@ +@@ -2914,7 +2914,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_STATEMENT_CLASSES VARIABLE_SCOPE GLOBAL @@ -1085,7 +1077,7 @@ VARIABLE_COMMENT Maximum number of statement instruments. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 256 -@@ -2754,7 +2754,7 @@ +@@ -2924,7 +2924,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_STATEMENT_STACK VARIABLE_SCOPE GLOBAL @@ -1094,7 +1086,7 @@ VARIABLE_COMMENT Number of rows per thread in EVENTS_STATEMENTS_CURRENT. NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 256 -@@ -2764,7 +2764,7 @@ +@@ -2934,7 +2934,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_TABLE_HANDLES VARIABLE_SCOPE GLOBAL @@ -1103,7 +1095,7 @@ VARIABLE_COMMENT Maximum number of opened instrumented tables. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1048576 -@@ -2774,7 +2774,7 @@ +@@ -2944,7 +2944,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_TABLE_INSTANCES VARIABLE_SCOPE GLOBAL @@ -1112,7 +1104,7 @@ VARIABLE_COMMENT Maximum number of instrumented tables. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1048576 -@@ -2784,7 +2784,7 @@ +@@ -2954,7 +2954,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_TABLE_LOCK_STAT VARIABLE_SCOPE GLOBAL @@ -1121,7 +1113,7 @@ VARIABLE_COMMENT Maximum number of lock statistics for instrumented tables. Use 0 to disable, -1 for automated scaling. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1048576 -@@ -2794,7 +2794,7 @@ +@@ -2964,7 +2964,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_THREAD_CLASSES VARIABLE_SCOPE GLOBAL @@ -1130,7 +1122,7 @@ VARIABLE_COMMENT Maximum number of thread instruments. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 256 -@@ -2804,7 +2804,7 @@ +@@ -2974,7 +2974,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_THREAD_INSTANCES VARIABLE_SCOPE GLOBAL @@ -1139,7 +1131,7 @@ VARIABLE_COMMENT Maximum number of instrumented threads. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1048576 -@@ -2814,7 +2814,7 @@ +@@ -2984,7 +2984,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_SESSION_CONNECT_ATTRS_SIZE VARIABLE_SCOPE GLOBAL @@ -1148,7 +1140,7 @@ VARIABLE_COMMENT Size of session attribute string buffer per thread. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1048576 -@@ -2824,7 +2824,7 @@ +@@ -2994,7 +2994,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_SETUP_ACTORS_SIZE VARIABLE_SCOPE GLOBAL @@ -1157,7 +1149,7 @@ VARIABLE_COMMENT Maximum number of rows in SETUP_ACTORS. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1024 -@@ -2834,7 +2834,7 @@ +@@ -3004,7 +3004,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_SETUP_OBJECTS_SIZE VARIABLE_SCOPE GLOBAL @@ -1166,7 +1158,7 @@ VARIABLE_COMMENT Maximum number of rows in SETUP_OBJECTS. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1048576 -@@ -2844,7 +2844,7 @@ +@@ -3014,7 +3014,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_USERS_SIZE VARIABLE_SCOPE GLOBAL @@ -1175,7 +1167,7 @@ VARIABLE_COMMENT Maximum number of instrumented users. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1048576 -@@ -2894,7 +2894,7 @@ +@@ -3064,7 +3064,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PRELOAD_BUFFER_SIZE VARIABLE_SCOPE SESSION @@ -1184,7 +1176,7 @@ VARIABLE_COMMENT The size of the buffer that is allocated when preloading indexes NUMERIC_MIN_VALUE 1024 NUMERIC_MAX_VALUE 1073741824 -@@ -2914,7 +2914,7 @@ +@@ -3084,7 +3084,7 @@ COMMAND_LINE_ARGUMENT NULL VARIABLE_NAME PROFILING_HISTORY_SIZE VARIABLE_SCOPE SESSION @@ -1193,7 +1185,7 @@ VARIABLE_COMMENT Number of statements about which profiling information is maintained. If set to 0, no profiles are stored. See SHOW PROFILES. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 100 -@@ -2924,7 +2924,7 @@ +@@ -3094,7 +3094,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PROGRESS_REPORT_TIME VARIABLE_SCOPE SESSION @@ -1202,7 +1194,7 @@ VARIABLE_COMMENT Seconds between sending progress reports to the client for time-consuming statements. Set to 0 to disable progress reporting. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 4294967295 -@@ -2984,7 +2984,7 @@ +@@ -3154,7 +3154,7 @@ COMMAND_LINE_ARGUMENT NULL VARIABLE_NAME QUERY_ALLOC_BLOCK_SIZE VARIABLE_SCOPE SESSION @@ -1211,7 +1203,7 @@ VARIABLE_COMMENT Allocation block size for query parsing and execution NUMERIC_MIN_VALUE 1024 NUMERIC_MAX_VALUE 4294967295 -@@ -2994,7 +2994,7 @@ +@@ -3164,7 +3164,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME QUERY_CACHE_LIMIT VARIABLE_SCOPE GLOBAL @@ -1220,7 +1212,7 @@ VARIABLE_COMMENT Don't cache results that are bigger than this NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 4294967295 -@@ -3004,7 +3004,7 @@ +@@ -3174,7 +3174,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME QUERY_CACHE_MIN_RES_UNIT VARIABLE_SCOPE GLOBAL @@ -1229,7 +1221,7 @@ VARIABLE_COMMENT The minimum size for blocks allocated by the query cache NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 4294967295 -@@ -3017,7 +3017,7 @@ +@@ -3187,7 +3187,7 @@ VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT The memory allocated to store results from old queries NUMERIC_MIN_VALUE 0 @@ -1238,7 +1230,7 @@ NUMERIC_BLOCK_SIZE 1024 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -3054,7 +3054,7 @@ +@@ -3224,7 +3224,7 @@ COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME QUERY_PREALLOC_SIZE VARIABLE_SCOPE SESSION @@ -1247,7 +1239,7 @@ VARIABLE_COMMENT Persistent buffer for query parsing and execution NUMERIC_MIN_VALUE 1024 NUMERIC_MAX_VALUE 4294967295 -@@ -3067,7 +3067,7 @@ +@@ -3237,7 +3237,7 @@ VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT Sets the internal state of the RAND() generator for replication purposes NUMERIC_MIN_VALUE 0 @@ -1256,7 +1248,7 @@ NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -3077,14 +3077,14 @@ +@@ -3247,14 +3247,14 @@ VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT Sets the internal state of the RAND() generator for replication purposes NUMERIC_MIN_VALUE 0 @@ -1273,7 +1265,7 @@ VARIABLE_COMMENT Allocation block size for storing ranges during optimization NUMERIC_MIN_VALUE 4096 NUMERIC_MAX_VALUE 4294967295 -@@ -3094,7 +3094,7 @@ +@@ -3264,7 +3264,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME READ_BUFFER_SIZE VARIABLE_SCOPE SESSION @@ -1282,7 +1274,7 @@ VARIABLE_COMMENT Each thread that does a sequential scan allocates a buffer of this size for each table it scans. If you do many sequential scans, you may want to increase this value NUMERIC_MIN_VALUE 8192 NUMERIC_MAX_VALUE 2147483647 -@@ -3114,7 +3114,7 @@ +@@ -3284,7 +3284,7 @@ COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME READ_RND_BUFFER_SIZE VARIABLE_SCOPE SESSION @@ -1291,7 +1283,7 @@ VARIABLE_COMMENT When reading rows in sorted order after a sort, the rows are read through this buffer to avoid a disk seeks NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 2147483647 -@@ -3134,10 +3134,10 @@ +@@ -3304,10 +3304,10 @@ COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME ROWID_MERGE_BUFF_SIZE VARIABLE_SCOPE SESSION @@ -1304,7 +1296,7 @@ NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -3174,7 +3174,7 @@ +@@ -3344,7 +3344,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME SERVER_ID VARIABLE_SCOPE SESSION @@ -1313,8 +1305,8 @@ VARIABLE_COMMENT Uniquely identifies the server instance in the community of replication partners NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 4294967295 -@@ -3254,7 +3254,7 @@ - COMMAND_LINE_ARGUMENT OPTIONAL +@@ -3434,7 +3434,7 @@ + COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME SLAVE_MAX_ALLOWED_PACKET VARIABLE_SCOPE GLOBAL -VARIABLE_TYPE BIGINT UNSIGNED @@ -1322,7 +1314,7 @@ VARIABLE_COMMENT The maximum packet length to sent successfully from the master to slave. NUMERIC_MIN_VALUE 1024 NUMERIC_MAX_VALUE 1073741824 -@@ -3264,7 +3264,7 @@ +@@ -3444,7 +3444,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME SLOW_LAUNCH_TIME VARIABLE_SCOPE GLOBAL @@ -1331,7 +1323,7 @@ VARIABLE_COMMENT If creating the thread takes longer than this value (in seconds), the Slow_launch_threads counter will be incremented NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 31536000 -@@ -3307,7 +3307,7 @@ +@@ -3487,7 +3487,7 @@ VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT Each thread that needs to do a sort allocates a buffer of this size NUMERIC_MIN_VALUE 1024 @@ -1340,7 +1332,7 @@ NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -3524,7 +3524,7 @@ +@@ -3704,7 +3704,7 @@ COMMAND_LINE_ARGUMENT NULL VARIABLE_NAME STORED_PROGRAM_CACHE VARIABLE_SCOPE GLOBAL @@ -1349,7 +1341,7 @@ VARIABLE_COMMENT The soft upper limit for number of cached stored routines for one connection. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 524288 -@@ -3614,7 +3614,7 @@ +@@ -3794,7 +3794,7 @@ COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME TABLE_DEFINITION_CACHE VARIABLE_SCOPE GLOBAL @@ -1358,7 +1350,7 @@ VARIABLE_COMMENT The number of cached table definitions NUMERIC_MIN_VALUE 400 NUMERIC_MAX_VALUE 2097152 -@@ -3624,7 +3624,7 @@ +@@ -3804,7 +3804,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME TABLE_OPEN_CACHE VARIABLE_SCOPE GLOBAL @@ -1367,7 +1359,7 @@ VARIABLE_COMMENT The number of cached open tables NUMERIC_MIN_VALUE 10 NUMERIC_MAX_VALUE 1048576 -@@ -3684,7 +3684,7 @@ +@@ -3864,7 +3864,7 @@ COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME THREAD_CACHE_SIZE VARIABLE_SCOPE GLOBAL @@ -1376,7 +1368,7 @@ VARIABLE_COMMENT How many threads we should keep in a cache for reuse. These are freed after 5 minutes of idle time NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 16384 -@@ -3767,7 +3767,7 @@ +@@ -3937,7 +3937,7 @@ VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT Max size for data for an internal temporary on-disk MyISAM or Aria table. NUMERIC_MIN_VALUE 1024 @@ -1385,7 +1377,7 @@ NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -3777,7 +3777,7 @@ +@@ -3947,7 +3947,7 @@ VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT If an internal in-memory temporary table exceeds this size, MariaDB will automatically convert it to an on-disk MyISAM or Aria table. Same as tmp_table_size. NUMERIC_MIN_VALUE 0 @@ -1394,7 +1386,7 @@ NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -3787,14 +3787,14 @@ +@@ -3957,14 +3957,14 @@ VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT Alias for tmp_memory_table_size. If an internal in-memory temporary table exceeds this size, MariaDB will automatically convert it to an on-disk MyISAM or Aria table. NUMERIC_MIN_VALUE 0 @@ -1411,8 +1403,8 @@ VARIABLE_COMMENT Allocation block size for transactions to be stored in binary log NUMERIC_MIN_VALUE 1024 NUMERIC_MAX_VALUE 134217728 -@@ -3804,7 +3804,7 @@ - COMMAND_LINE_ARGUMENT REQUIRED +@@ -3984,7 +3984,7 @@ + COMMAND_LINE_ARGUMENT NULL VARIABLE_NAME TRANSACTION_PREALLOC_SIZE VARIABLE_SCOPE SESSION -VARIABLE_TYPE BIGINT UNSIGNED @@ -1420,7 +1412,7 @@ VARIABLE_COMMENT Persistent buffer for transactions to be stored in binary log NUMERIC_MIN_VALUE 1024 NUMERIC_MAX_VALUE 134217728 -@@ -3944,7 +3944,7 @@ +@@ -4134,7 +4134,7 @@ COMMAND_LINE_ARGUMENT NULL VARIABLE_NAME WAIT_TIMEOUT VARIABLE_SCOPE SESSION @@ -1429,7 +1421,7 @@ VARIABLE_COMMENT The number of seconds the server waits for activity on a connection before closing it NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 31536000 -@@ -3971,7 +3971,7 @@ +@@ -4161,7 +4161,7 @@ VARIABLE_NAME LOG_TC_SIZE GLOBAL_VALUE_ORIGIN AUTO VARIABLE_SCOPE GLOBAL diff --git a/mysql-test/suite/sys_vars/r/sysvars_server_embedded.result b/mysql-test/suite/sys_vars/r/sysvars_server_embedded.result index b58d18fb..561d4a5e 100644 --- a/mysql-test/suite/sys_vars/r/sysvars_server_embedded.result +++ b/mysql-test/suite/sys_vars/r/sysvars_server_embedded.result @@ -432,6 +432,36 @@ NUMERIC_BLOCK_SIZE NULL ENUM_VALUE_LIST MIXED,STATEMENT,ROW READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED +VARIABLE_NAME BINLOG_GTID_INDEX +VARIABLE_SCOPE GLOBAL +VARIABLE_TYPE BOOLEAN +VARIABLE_COMMENT Enable the creation of a GTID index for every binlog file, and the use of such index for speeding up GTID lookup in the binlog. +NUMERIC_MIN_VALUE NULL +NUMERIC_MAX_VALUE NULL +NUMERIC_BLOCK_SIZE NULL +ENUM_VALUE_LIST OFF,ON +READ_ONLY NO +COMMAND_LINE_ARGUMENT OPTIONAL +VARIABLE_NAME BINLOG_GTID_INDEX_PAGE_SIZE +VARIABLE_SCOPE GLOBAL +VARIABLE_TYPE INT UNSIGNED +VARIABLE_COMMENT Page size to use for the binlog GTID index. +NUMERIC_MIN_VALUE 64 +NUMERIC_MAX_VALUE 16777216 +NUMERIC_BLOCK_SIZE 1 +ENUM_VALUE_LIST NULL +READ_ONLY NO +COMMAND_LINE_ARGUMENT REQUIRED +VARIABLE_NAME BINLOG_GTID_INDEX_SPAN_MIN +VARIABLE_SCOPE GLOBAL +VARIABLE_TYPE INT UNSIGNED +VARIABLE_COMMENT Control sparseness of the binlog GTID index. If set to N, at most one index record will be added for every N bytes of binlog file written, to reduce the size of the index. Normally does not need tuning. +NUMERIC_MIN_VALUE 1 +NUMERIC_MAX_VALUE 1073741824 +NUMERIC_BLOCK_SIZE 1 +ENUM_VALUE_LIST NULL +READ_ONLY NO +COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME BINLOG_OPTIMIZE_THREAD_SCHEDULING VARIABLE_SCOPE GLOBAL VARIABLE_TYPE BOOLEAN @@ -445,11 +475,11 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME BINLOG_ROW_IMAGE VARIABLE_SCOPE SESSION VARIABLE_TYPE ENUM -VARIABLE_COMMENT Controls whether rows should be logged in 'FULL', 'NOBLOB' or 'MINIMAL' formats. 'FULL', means that all columns in the before and after image are logged. 'NOBLOB', means that mysqld avoids logging blob columns whenever possible (eg, blob column was not changed or is not part of primary key). 'MINIMAL', means that a PK equivalent (PK columns or full row if there is no PK in the table) is logged in the before image, and only changed columns are logged in the after image. (Default: FULL). +VARIABLE_COMMENT Controls whether rows should be logged in 'FULL', 'FULL_NODUP', 'NOBLOB' or 'MINIMAL' formats. 'FULL', means that all columns in the before and after image are logged. 'FULL_NODUP', means that all columns are logged in before image, but only changed columns or all columns of inserted record are logged in after image, 'NOBLOB', means that mysqld avoids logging blob columns whenever possible (eg, blob column was not changed or is not part of primary key). 'MINIMAL', means that a PK equivalent (PK columns or full row if there is no PK in the table) is logged in the before image, and only changed columns are logged in the after image. (Default: FULL). NUMERIC_MIN_VALUE NULL NUMERIC_MAX_VALUE NULL NUMERIC_BLOCK_SIZE NULL -ENUM_VALUE_LIST MINIMAL,NOBLOB,FULL +ENUM_VALUE_LIST MINIMAL,NOBLOB,FULL,FULL_NODUP READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME BINLOG_ROW_METADATA @@ -462,6 +492,16 @@ NUMERIC_BLOCK_SIZE NULL ENUM_VALUE_LIST NO_LOG,MINIMAL,FULL READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED +VARIABLE_NAME BINLOG_SPACE_LIMIT +VARIABLE_SCOPE GLOBAL +VARIABLE_TYPE BIGINT UNSIGNED +VARIABLE_COMMENT Alias for max_binlog_total_size. Compatibility with Percona server. +NUMERIC_MIN_VALUE 0 +NUMERIC_MAX_VALUE 18446744073709551615 +NUMERIC_BLOCK_SIZE 1 +ENUM_VALUE_LIST NULL +READ_ONLY NO +COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME BINLOG_STMT_CACHE_SIZE VARIABLE_SCOPE GLOBAL VARIABLE_TYPE BIGINT UNSIGNED @@ -472,6 +512,16 @@ NUMERIC_BLOCK_SIZE 4096 ENUM_VALUE_LIST NULL READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED +VARIABLE_NAME BLOCK_ENCRYPTION_MODE +VARIABLE_SCOPE SESSION +VARIABLE_TYPE ENUM +VARIABLE_COMMENT Default block encryption mode for AES_ENCRYPT() and AES_DECRYPT() functions +NUMERIC_MIN_VALUE NULL +NUMERIC_MAX_VALUE NULL +NUMERIC_BLOCK_SIZE NULL +ENUM_VALUE_LIST aes-128-ecb,aes-192-ecb,aes-256-ecb,aes-128-cbc,aes-192-cbc,aes-256-cbc,aes-128-ctr,aes-192-ctr,aes-256-ctr +READ_ONLY NO +COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME BULK_INSERT_BUFFER_SIZE VARIABLE_SCOPE SESSION VARIABLE_TYPE BIGINT UNSIGNED @@ -502,6 +552,16 @@ NUMERIC_BLOCK_SIZE NULL ENUM_VALUE_LIST NULL READ_ONLY NO COMMAND_LINE_ARGUMENT NULL +VARIABLE_NAME CHARACTER_SET_COLLATIONS +VARIABLE_SCOPE SESSION +VARIABLE_TYPE VARCHAR +VARIABLE_COMMENT Overrides for character set default collations +NUMERIC_MIN_VALUE NULL +NUMERIC_MAX_VALUE NULL +NUMERIC_BLOCK_SIZE NULL +ENUM_VALUE_LIST NULL +READ_ONLY NO +COMMAND_LINE_ARGUMENT NULL VARIABLE_NAME CHARACTER_SET_CONNECTION VARIABLE_SCOPE SESSION VARIABLE_TYPE ENUM @@ -692,26 +752,6 @@ NUMERIC_BLOCK_SIZE NULL ENUM_VALUE_LIST NULL READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED -VARIABLE_NAME DATETIME_FORMAT -VARIABLE_SCOPE GLOBAL -VARIABLE_TYPE VARCHAR -VARIABLE_COMMENT The DATETIME format (ignored) -NUMERIC_MIN_VALUE NULL -NUMERIC_MAX_VALUE NULL -NUMERIC_BLOCK_SIZE NULL -ENUM_VALUE_LIST NULL -READ_ONLY YES -COMMAND_LINE_ARGUMENT REQUIRED -VARIABLE_NAME DATE_FORMAT -VARIABLE_SCOPE GLOBAL -VARIABLE_TYPE VARCHAR -VARIABLE_COMMENT The DATE format (ignored) -NUMERIC_MIN_VALUE NULL -NUMERIC_MAX_VALUE NULL -NUMERIC_BLOCK_SIZE NULL -ENUM_VALUE_LIST NULL -READ_ONLY YES -COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME DEADLOCK_SEARCH_DEPTH_LONG VARIABLE_SCOPE SESSION VARIABLE_TYPE BIGINT UNSIGNED @@ -1675,7 +1715,7 @@ COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME LOG_SLOW_ADMIN_STATEMENTS VARIABLE_SCOPE SESSION VARIABLE_TYPE BOOLEAN -VARIABLE_COMMENT Log slow OPTIMIZE, ANALYZE, ALTER and other administrative statements to the slow log if it is open. Resets or sets the option 'admin' in log_slow_disabled_statements +VARIABLE_COMMENT Log slow OPTIMIZE, ANALYZE, ALTER and other administrative statements to the slow log if it is open. Resets or sets the option 'admin' in log_slow_filter. Deprecated, use log_slow_filter without 'admin'. NUMERIC_MIN_VALUE NULL NUMERIC_MAX_VALUE NULL NUMERIC_BLOCK_SIZE NULL @@ -1872,6 +1912,16 @@ NUMERIC_BLOCK_SIZE 4096 ENUM_VALUE_LIST NULL READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED +VARIABLE_NAME MAX_BINLOG_TOTAL_SIZE +VARIABLE_SCOPE GLOBAL +VARIABLE_TYPE BIGINT UNSIGNED +VARIABLE_COMMENT Maximum space to use for all binary logs. Extra logs are deleted on server start, log rotation, FLUSH LOGS or when writing to binlog. Default is 0, which means no size restrictions. See also slave_connections_needed_for_purge +NUMERIC_MIN_VALUE 0 +NUMERIC_MAX_VALUE 18446744073709551615 +NUMERIC_BLOCK_SIZE 1 +ENUM_VALUE_LIST NULL +READ_ONLY NO +COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME MAX_CONNECTIONS VARIABLE_SCOPE GLOBAL VARIABLE_TYPE BIGINT UNSIGNED @@ -2052,16 +2102,6 @@ NUMERIC_BLOCK_SIZE NULL ENUM_VALUE_LIST NULL READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED -VARIABLE_NAME MAX_TMP_TABLES -VARIABLE_SCOPE SESSION -VARIABLE_TYPE BIGINT UNSIGNED -VARIABLE_COMMENT Unused, will be removed. -NUMERIC_MIN_VALUE 1 -NUMERIC_MAX_VALUE 4294967295 -NUMERIC_BLOCK_SIZE 1 -ENUM_VALUE_LIST NULL -READ_ONLY NO -COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME MAX_USER_CONNECTIONS VARIABLE_SCOPE SESSION VARIABLE_TYPE INT @@ -2282,16 +2322,6 @@ NUMERIC_BLOCK_SIZE NULL ENUM_VALUE_LIST OFF,ON READ_ONLY NO COMMAND_LINE_ARGUMENT OPTIONAL -VARIABLE_NAME OLD_ALTER_TABLE -VARIABLE_SCOPE SESSION -VARIABLE_TYPE ENUM -VARIABLE_COMMENT Alias for alter_algorithm. Deprecated. Use --alter-algorithm instead. -NUMERIC_MIN_VALUE NULL -NUMERIC_MAX_VALUE NULL -NUMERIC_BLOCK_SIZE NULL -ENUM_VALUE_LIST DEFAULT,COPY,INPLACE,NOCOPY,INSTANT -READ_ONLY NO -COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME OLD_MODE VARIABLE_SCOPE SESSION VARIABLE_TYPE SET @@ -2299,7 +2329,7 @@ VARIABLE_COMMENT Used to emulate old behavior from earlier MariaDB or MySQL vers NUMERIC_MIN_VALUE NULL NUMERIC_MAX_VALUE NULL NUMERIC_BLOCK_SIZE NULL -ENUM_VALUE_LIST NO_DUP_KEY_WARNINGS_WITH_IGNORE,NO_PROGRESS_INFO,ZERO_DATE_TIME_CAST,UTF8_IS_UTF8MB3,IGNORE_INDEX_ONLY_FOR_JOIN,COMPAT_5_1_CHECKSUM,NO_NULL_COLLATION_IDS +ENUM_VALUE_LIST NO_DUP_KEY_WARNINGS_WITH_IGNORE,NO_PROGRESS_INFO,ZERO_DATE_TIME_CAST,UTF8_IS_UTF8MB3,IGNORE_INDEX_ONLY_FOR_JOIN,COMPAT_5_1_CHECKSUM,NO_NULL_COLLATION_IDS,LOCK_ALTER_TABLE_COPY READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME OLD_PASSWORDS @@ -2324,12 +2354,32 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME OPTIMIZER_ADJUST_SECONDARY_KEY_COSTS VARIABLE_SCOPE SESSION -VARIABLE_TYPE SET -VARIABLE_COMMENT A bit field with the following values: adjust_secondary_key_cost = Update secondary key costs for ranges to be at least 5x of clustered primary key costs. disable_max_seek = Disable 'max_seek optimization' for secondary keys and slight adjustment of filter cost. disable_forced_index_in_group_by = Disable automatic forced index in GROUP BY. This variable will be deleted in MariaDB 11.0 as it is not needed with the new 11.0 optimizer. -NUMERIC_MIN_VALUE NULL -NUMERIC_MAX_VALUE NULL +VARIABLE_TYPE BIGINT UNSIGNED +VARIABLE_COMMENT Unused, will be removed. +NUMERIC_MIN_VALUE 0 +NUMERIC_MAX_VALUE 2 +NUMERIC_BLOCK_SIZE 1 +ENUM_VALUE_LIST NULL +READ_ONLY NO +COMMAND_LINE_ARGUMENT REQUIRED +VARIABLE_NAME OPTIMIZER_DISK_READ_COST +VARIABLE_SCOPE GLOBAL +VARIABLE_TYPE DOUBLE +VARIABLE_COMMENT Cost of reading a block of IO_SIZE (4096) from a disk (in usec). +NUMERIC_MIN_VALUE 0 +NUMERIC_MAX_VALUE 10000 +NUMERIC_BLOCK_SIZE NULL +ENUM_VALUE_LIST NULL +READ_ONLY NO +COMMAND_LINE_ARGUMENT REQUIRED +VARIABLE_NAME OPTIMIZER_DISK_READ_RATIO +VARIABLE_SCOPE GLOBAL +VARIABLE_TYPE DOUBLE +VARIABLE_COMMENT Chance that we have to do a disk read to find a row or index entry from the engine cache (cache_misses/total_cache_requests). 0.0 means that everything is cached and 1.0 means that nothing is expected to be in the engine cache. +NUMERIC_MIN_VALUE 0 +NUMERIC_MAX_VALUE 1 NUMERIC_BLOCK_SIZE NULL -ENUM_VALUE_LIST adjust_secondary_key_cost,disable_max_seek,disable_forced_index_in_group_by +ENUM_VALUE_LIST NULL READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME OPTIMIZER_EXTRA_PRUNING_DEPTH @@ -2342,6 +2392,56 @@ NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED +VARIABLE_NAME OPTIMIZER_INDEX_BLOCK_COPY_COST +VARIABLE_SCOPE GLOBAL +VARIABLE_TYPE DOUBLE +VARIABLE_COMMENT Cost of copying a key block from the cache to intern storage as part of an index scan. +NUMERIC_MIN_VALUE 0 +NUMERIC_MAX_VALUE 1000 +NUMERIC_BLOCK_SIZE NULL +ENUM_VALUE_LIST NULL +READ_ONLY NO +COMMAND_LINE_ARGUMENT REQUIRED +VARIABLE_NAME OPTIMIZER_KEY_COMPARE_COST +VARIABLE_SCOPE GLOBAL +VARIABLE_TYPE DOUBLE +VARIABLE_COMMENT Cost of checking a key against the end key condition. +NUMERIC_MIN_VALUE 0 +NUMERIC_MAX_VALUE 1000 +NUMERIC_BLOCK_SIZE NULL +ENUM_VALUE_LIST NULL +READ_ONLY NO +COMMAND_LINE_ARGUMENT REQUIRED +VARIABLE_NAME OPTIMIZER_KEY_COPY_COST +VARIABLE_SCOPE GLOBAL +VARIABLE_TYPE DOUBLE +VARIABLE_COMMENT Cost of finding the next key in the engine and copying it to the SQL layer. +NUMERIC_MIN_VALUE 0 +NUMERIC_MAX_VALUE 1000 +NUMERIC_BLOCK_SIZE NULL +ENUM_VALUE_LIST NULL +READ_ONLY NO +COMMAND_LINE_ARGUMENT REQUIRED +VARIABLE_NAME OPTIMIZER_KEY_LOOKUP_COST +VARIABLE_SCOPE GLOBAL +VARIABLE_TYPE DOUBLE +VARIABLE_COMMENT Cost for finding a key based on a key value +NUMERIC_MIN_VALUE 0 +NUMERIC_MAX_VALUE 1000 +NUMERIC_BLOCK_SIZE NULL +ENUM_VALUE_LIST NULL +READ_ONLY NO +COMMAND_LINE_ARGUMENT REQUIRED +VARIABLE_NAME OPTIMIZER_KEY_NEXT_FIND_COST +VARIABLE_SCOPE GLOBAL +VARIABLE_TYPE DOUBLE +VARIABLE_COMMENT Cost of finding the next key and rowid when using filters. +NUMERIC_MIN_VALUE 0 +NUMERIC_MAX_VALUE 1000 +NUMERIC_BLOCK_SIZE NULL +ENUM_VALUE_LIST NULL +READ_ONLY NO +COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME OPTIMIZER_MAX_SEL_ARGS VARIABLE_SCOPE SESSION VARIABLE_TYPE BIGINT UNSIGNED @@ -2372,6 +2472,66 @@ NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED +VARIABLE_NAME OPTIMIZER_ROWID_COMPARE_COST +VARIABLE_SCOPE GLOBAL +VARIABLE_TYPE DOUBLE +VARIABLE_COMMENT Cost of comparing two rowid's +NUMERIC_MIN_VALUE 0 +NUMERIC_MAX_VALUE 1000 +NUMERIC_BLOCK_SIZE NULL +ENUM_VALUE_LIST NULL +READ_ONLY NO +COMMAND_LINE_ARGUMENT REQUIRED +VARIABLE_NAME OPTIMIZER_ROWID_COPY_COST +VARIABLE_SCOPE GLOBAL +VARIABLE_TYPE DOUBLE +VARIABLE_COMMENT Cost of copying a rowid +NUMERIC_MIN_VALUE 0 +NUMERIC_MAX_VALUE 1000 +NUMERIC_BLOCK_SIZE NULL +ENUM_VALUE_LIST NULL +READ_ONLY NO +COMMAND_LINE_ARGUMENT REQUIRED +VARIABLE_NAME OPTIMIZER_ROW_COPY_COST +VARIABLE_SCOPE GLOBAL +VARIABLE_TYPE DOUBLE +VARIABLE_COMMENT Cost of copying a row from the engine or the join cache to the SQL layer. +NUMERIC_MIN_VALUE 0 +NUMERIC_MAX_VALUE 1000 +NUMERIC_BLOCK_SIZE NULL +ENUM_VALUE_LIST NULL +READ_ONLY NO +COMMAND_LINE_ARGUMENT REQUIRED +VARIABLE_NAME OPTIMIZER_ROW_LOOKUP_COST +VARIABLE_SCOPE GLOBAL +VARIABLE_TYPE DOUBLE +VARIABLE_COMMENT Cost of finding a row based on a rowid or a clustered key. +NUMERIC_MIN_VALUE 0 +NUMERIC_MAX_VALUE 1000 +NUMERIC_BLOCK_SIZE NULL +ENUM_VALUE_LIST NULL +READ_ONLY NO +COMMAND_LINE_ARGUMENT REQUIRED +VARIABLE_NAME OPTIMIZER_ROW_NEXT_FIND_COST +VARIABLE_SCOPE GLOBAL +VARIABLE_TYPE DOUBLE +VARIABLE_COMMENT Cost of finding the next row when scanning the table. +NUMERIC_MIN_VALUE 0 +NUMERIC_MAX_VALUE 1000 +NUMERIC_BLOCK_SIZE NULL +ENUM_VALUE_LIST NULL +READ_ONLY NO +COMMAND_LINE_ARGUMENT REQUIRED +VARIABLE_NAME OPTIMIZER_SCAN_SETUP_COST +VARIABLE_SCOPE SESSION +VARIABLE_TYPE DOUBLE +VARIABLE_COMMENT Extra cost added to TABLE and INDEX scans to get optimizer to prefer index lookups. +NUMERIC_MIN_VALUE 0 +NUMERIC_MAX_VALUE 100000000 +NUMERIC_BLOCK_SIZE NULL +ENUM_VALUE_LIST NULL +READ_ONLY NO +COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME OPTIMIZER_SEARCH_DEPTH VARIABLE_SCOPE SESSION VARIABLE_TYPE BIGINT UNSIGNED @@ -2399,7 +2559,7 @@ VARIABLE_COMMENT Fine-tune the optimizer behavior NUMERIC_MIN_VALUE NULL NUMERIC_MAX_VALUE NULL NUMERIC_BLOCK_SIZE NULL -ENUM_VALUE_LIST index_merge,index_merge_union,index_merge_sort_union,index_merge_intersection,index_merge_sort_intersection,engine_condition_pushdown,index_condition_pushdown,derived_merge,derived_with_keys,firstmatch,loosescan,materialization,in_to_exists,semijoin,partial_match_rowid_merge,partial_match_table_scan,subquery_cache,mrr,mrr_cost_based,mrr_sort_keys,outer_join_with_cache,semijoin_with_cache,join_cache_incremental,join_cache_hashed,join_cache_bka,optimize_join_buffer_size,table_elimination,extended_keys,exists_to_in,orderby_uses_equalities,condition_pushdown_for_derived,split_materialized,condition_pushdown_for_subquery,rowid_filter,condition_pushdown_from_having,not_null_range_scan,hash_join_cardinality,cset_narrowing,default +ENUM_VALUE_LIST index_merge,index_merge_union,index_merge_sort_union,index_merge_intersection,index_merge_sort_intersection,index_condition_pushdown,derived_merge,derived_with_keys,firstmatch,loosescan,materialization,in_to_exists,semijoin,partial_match_rowid_merge,partial_match_table_scan,subquery_cache,mrr,mrr_cost_based,mrr_sort_keys,outer_join_with_cache,semijoin_with_cache,join_cache_incremental,join_cache_hashed,join_cache_bka,optimize_join_buffer_size,table_elimination,extended_keys,exists_to_in,orderby_uses_equalities,condition_pushdown_for_derived,split_materialized,condition_pushdown_for_subquery,rowid_filter,condition_pushdown_from_having,not_null_range_scan,hash_join_cardinality,cset_narrowing,sargable_casefold,default READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME OPTIMIZER_TRACE @@ -2432,6 +2592,16 @@ NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED +VARIABLE_NAME OPTIMIZER_WHERE_COST +VARIABLE_SCOPE SESSION +VARIABLE_TYPE DOUBLE +VARIABLE_COMMENT Cost of checking the row against the WHERE clause. Increasing this will have the optimizer to prefer plans with less row combinations. +NUMERIC_MIN_VALUE 0 +NUMERIC_MAX_VALUE 100000 +NUMERIC_BLOCK_SIZE NULL +ENUM_VALUE_LIST NULL +READ_ONLY NO +COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA VARIABLE_SCOPE GLOBAL VARIABLE_TYPE BOOLEAN @@ -3252,6 +3422,16 @@ NUMERIC_BLOCK_SIZE NULL ENUM_VALUE_LIST OFF,ON READ_ONLY NO COMMAND_LINE_ARGUMENT OPTIONAL +VARIABLE_NAME SLAVE_CONNECTIONS_NEEDED_FOR_PURGE +VARIABLE_SCOPE GLOBAL +VARIABLE_TYPE INT UNSIGNED +VARIABLE_COMMENT Minimum number of connected slaves required for automatic binary log purge with max_binlog_total_size, binlog_expire_logs_seconds or binlog_expire_logs_days. +NUMERIC_MIN_VALUE 0 +NUMERIC_MAX_VALUE 4294967295 +NUMERIC_BLOCK_SIZE 1 +ENUM_VALUE_LIST NULL +READ_ONLY NO +COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME SLAVE_MAX_ALLOWED_PACKET VARIABLE_SCOPE GLOBAL VARIABLE_TYPE BIGINT UNSIGNED @@ -3722,16 +3902,6 @@ NUMERIC_BLOCK_SIZE NULL ENUM_VALUE_LIST NULL READ_ONLY NO COMMAND_LINE_ARGUMENT NULL -VARIABLE_NAME TIME_FORMAT -VARIABLE_SCOPE GLOBAL -VARIABLE_TYPE VARCHAR -VARIABLE_COMMENT The TIME format (ignored) -NUMERIC_MIN_VALUE NULL -NUMERIC_MAX_VALUE NULL -NUMERIC_BLOCK_SIZE NULL -ENUM_VALUE_LIST NULL -READ_ONLY YES -COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME TIME_ZONE VARIABLE_SCOPE SESSION VARIABLE_TYPE VARCHAR @@ -3802,6 +3972,16 @@ NUMERIC_BLOCK_SIZE 1024 ENUM_VALUE_LIST NULL READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED +VARIABLE_NAME TRANSACTION_ISOLATION +VARIABLE_SCOPE SESSION +VARIABLE_TYPE ENUM +VARIABLE_COMMENT Default transaction isolation level +NUMERIC_MIN_VALUE NULL +NUMERIC_MAX_VALUE NULL +NUMERIC_BLOCK_SIZE NULL +ENUM_VALUE_LIST READ-UNCOMMITTED,READ-COMMITTED,REPEATABLE-READ,SERIALIZABLE +READ_ONLY NO +COMMAND_LINE_ARGUMENT NULL VARIABLE_NAME TRANSACTION_PREALLOC_SIZE VARIABLE_SCOPE SESSION VARIABLE_TYPE BIGINT UNSIGNED @@ -3812,10 +3992,20 @@ NUMERIC_BLOCK_SIZE 1024 ENUM_VALUE_LIST NULL READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED +VARIABLE_NAME TRANSACTION_READ_ONLY +VARIABLE_SCOPE SESSION +VARIABLE_TYPE BOOLEAN +VARIABLE_COMMENT Default transaction access mode. If set to OFF, the default, access is read/write. If set to ON, access is read-only. The SET TRANSACTION statement can also change the value of this variable. See SET TRANSACTION and START TRANSACTION. +NUMERIC_MIN_VALUE NULL +NUMERIC_MAX_VALUE NULL +NUMERIC_BLOCK_SIZE NULL +ENUM_VALUE_LIST OFF,ON +READ_ONLY NO +COMMAND_LINE_ARGUMENT NULL VARIABLE_NAME TX_ISOLATION VARIABLE_SCOPE SESSION VARIABLE_TYPE ENUM -VARIABLE_COMMENT Default transaction isolation level +VARIABLE_COMMENT Default transaction isolation level.This variable is deprecated and will be removed in a future release. NUMERIC_MIN_VALUE NULL NUMERIC_MAX_VALUE NULL NUMERIC_BLOCK_SIZE NULL @@ -3825,7 +4015,7 @@ COMMAND_LINE_ARGUMENT NULL VARIABLE_NAME TX_READ_ONLY VARIABLE_SCOPE SESSION VARIABLE_TYPE BOOLEAN -VARIABLE_COMMENT Default transaction access mode. If set to OFF, the default, access is read/write. If set to ON, access is read-only. The SET TRANSACTION statement can also change the value of this variable. See SET TRANSACTION and START TRANSACTION. +VARIABLE_COMMENT Default transaction access mode. If set to OFF, the default, access is read/write. If set to ON, access is read-only. The SET TRANSACTION statement can also change the value of this variable. See SET TRANSACTION and START TRANSACTION.This variable is deprecated and will be removed in a future release. NUMERIC_MIN_VALUE NULL NUMERIC_MAX_VALUE NULL NUMERIC_BLOCK_SIZE NULL diff --git a/mysql-test/suite/sys_vars/r/sysvars_server_notembedded,32bit.rdiff b/mysql-test/suite/sys_vars/r/sysvars_server_notembedded,32bit.rdiff index a3f9acf3..31978fd0 100644 --- a/mysql-test/suite/sys_vars/r/sysvars_server_notembedded,32bit.rdiff +++ b/mysql-test/suite/sys_vars/r/sysvars_server_notembedded,32bit.rdiff @@ -1,5 +1,5 @@ ---- sysvars_server_notembedded.result 2024-01-28 17:50:35.442241137 +0100 -+++ sysvars_server_notembedded,32bit.result 2024-01-28 17:51:20.662078993 +0100 +--- sysvars_server_notembedded.result 2024-02-15 09:34:10.109925277 +0100 ++++ sysvars_server_notembedded,32bit.result 2024-02-15 10:35:52.037016777 +0100 @@ -44,7 +44,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME ARIA_BLOCK_SIZE @@ -164,8 +164,8 @@ NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -414,7 +414,7 @@ - COMMAND_LINE_ARGUMENT OPTIONAL +@@ -424,7 +424,7 @@ + COMMAND_LINE_ARGUMENT NULL VARIABLE_NAME BINLOG_EXPIRE_LOGS_SECONDS VARIABLE_SCOPE GLOBAL -VARIABLE_TYPE BIGINT UNSIGNED @@ -173,7 +173,7 @@ VARIABLE_COMMENT If non-zero, binary logs will be purged after binlog_expire_logs_seconds seconds; It and expire_logs_days are linked, such that changes in one are converted into the other. Possible purges happen at startup and at binary log rotation. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 8553600 -@@ -427,7 +427,7 @@ +@@ -437,7 +437,7 @@ VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT The size of file cache for the binary log NUMERIC_MIN_VALUE 8192 @@ -182,7 +182,16 @@ NUMERIC_BLOCK_SIZE 4096 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -477,7 +477,7 @@ +@@ -514,7 +514,7 @@ + COMMAND_LINE_ARGUMENT REQUIRED + VARIABLE_NAME BINLOG_ROW_EVENT_MAX_SIZE + VARIABLE_SCOPE GLOBAL +-VARIABLE_TYPE BIGINT UNSIGNED ++VARIABLE_TYPE INT UNSIGNED + VARIABLE_COMMENT The maximum size of a row-based binary log event in bytes. Rows will be grouped into events smaller than this size if possible. The value has to be a multiple of 256. + NUMERIC_MIN_VALUE 256 + NUMERIC_MAX_VALUE 4294967040 +@@ -557,7 +557,7 @@ VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT The size of the statement cache for updates to non-transactional engines for the binary log. If you often use statements updating a great number of rows, you can increase this to get more performance. NUMERIC_MIN_VALUE 4096 @@ -191,7 +200,7 @@ NUMERIC_BLOCK_SIZE 4096 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -487,7 +487,7 @@ +@@ -577,7 +577,7 @@ VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT Size of tree cache used in bulk insert optimisation. Note that this is a limit per thread! NUMERIC_MIN_VALUE 0 @@ -200,7 +209,7 @@ NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -674,7 +674,7 @@ +@@ -774,7 +774,7 @@ COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME CONNECT_TIMEOUT VARIABLE_SCOPE GLOBAL @@ -209,7 +218,7 @@ VARIABLE_COMMENT The number of seconds the mysqld server is waiting for a connect packet before responding with 'Bad handshake' NUMERIC_MIN_VALUE 2 NUMERIC_MAX_VALUE 31536000 -@@ -724,7 +724,7 @@ +@@ -804,7 +804,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME DEADLOCK_SEARCH_DEPTH_LONG VARIABLE_SCOPE SESSION @@ -218,7 +227,7 @@ VARIABLE_COMMENT Long search depth for the two-step deadlock detection NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 33 -@@ -734,7 +734,7 @@ +@@ -814,7 +814,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME DEADLOCK_SEARCH_DEPTH_SHORT VARIABLE_SCOPE SESSION @@ -227,7 +236,7 @@ VARIABLE_COMMENT Short search depth for the two-step deadlock detection NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 32 -@@ -744,7 +744,7 @@ +@@ -824,7 +824,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME DEADLOCK_TIMEOUT_LONG VARIABLE_SCOPE SESSION @@ -236,7 +245,7 @@ VARIABLE_COMMENT Long timeout for the two-step deadlock detection (in microseconds) NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 4294967295 -@@ -754,7 +754,7 @@ +@@ -834,7 +834,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME DEADLOCK_TIMEOUT_SHORT VARIABLE_SCOPE SESSION @@ -245,7 +254,7 @@ VARIABLE_COMMENT Short timeout for the two-step deadlock detection (in microseconds) NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 4294967295 -@@ -814,7 +814,7 @@ +@@ -894,7 +894,7 @@ COMMAND_LINE_ARGUMENT NULL VARIABLE_NAME DEFAULT_WEEK_FORMAT VARIABLE_SCOPE SESSION @@ -254,7 +263,7 @@ VARIABLE_COMMENT The default week format used by WEEK() functions NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 7 -@@ -824,7 +824,7 @@ +@@ -904,7 +904,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME DELAYED_INSERT_LIMIT VARIABLE_SCOPE GLOBAL @@ -263,7 +272,7 @@ VARIABLE_COMMENT After inserting delayed_insert_limit rows, the INSERT DELAYED handler will check if there are any SELECT statements pending. If so, it allows these to execute before continuing. NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 4294967295 -@@ -834,7 +834,7 @@ +@@ -914,7 +914,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME DELAYED_INSERT_TIMEOUT VARIABLE_SCOPE GLOBAL @@ -272,7 +281,7 @@ VARIABLE_COMMENT How long a INSERT DELAYED thread should wait for INSERT statements before terminating NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 31536000 -@@ -844,7 +844,7 @@ +@@ -924,7 +924,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME DELAYED_QUEUE_SIZE VARIABLE_SCOPE GLOBAL @@ -281,7 +290,7 @@ VARIABLE_COMMENT What size queue (in rows) should be allocated for handling INSERT DELAYED. If the queue becomes full, any client that does INSERT DELAYED will wait until there is room in the queue again NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 4294967295 -@@ -874,7 +874,7 @@ +@@ -954,7 +954,7 @@ COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME DIV_PRECISION_INCREMENT VARIABLE_SCOPE SESSION @@ -290,7 +299,7 @@ VARIABLE_COMMENT Precision of the result of '/' operator will be increased on that value NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 38 -@@ -994,7 +994,7 @@ +@@ -1074,7 +1074,7 @@ COMMAND_LINE_ARGUMENT NULL VARIABLE_NAME EXTRA_MAX_CONNECTIONS VARIABLE_SCOPE GLOBAL @@ -299,7 +308,7 @@ VARIABLE_COMMENT The number of connections on extra-port NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 100000 -@@ -1024,7 +1024,7 @@ +@@ -1104,7 +1104,7 @@ COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME FLUSH_TIME VARIABLE_SCOPE GLOBAL @@ -308,7 +317,7 @@ VARIABLE_COMMENT A dedicated thread is created to flush all tables at the given interval NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 31536000 -@@ -1054,7 +1054,7 @@ +@@ -1134,7 +1134,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME FT_MAX_WORD_LEN VARIABLE_SCOPE GLOBAL @@ -317,7 +326,7 @@ VARIABLE_COMMENT The maximum length of the word to be included in a FULLTEXT index. Note: FULLTEXT indexes must be rebuilt after changing this variable NUMERIC_MIN_VALUE 10 NUMERIC_MAX_VALUE 84 -@@ -1064,7 +1064,7 @@ +@@ -1144,7 +1144,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME FT_MIN_WORD_LEN VARIABLE_SCOPE GLOBAL @@ -326,7 +335,7 @@ VARIABLE_COMMENT The minimum length of the word to be included in a FULLTEXT index. Note: FULLTEXT indexes must be rebuilt after changing this variable NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 84 -@@ -1074,7 +1074,7 @@ +@@ -1154,7 +1154,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME FT_QUERY_EXPANSION_LIMIT VARIABLE_SCOPE GLOBAL @@ -335,7 +344,7 @@ VARIABLE_COMMENT Number of best matches to use for query expansion NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 1000 -@@ -1324,7 +1324,7 @@ +@@ -1404,7 +1404,7 @@ COMMAND_LINE_ARGUMENT NULL VARIABLE_NAME HISTOGRAM_SIZE VARIABLE_SCOPE SESSION @@ -344,7 +353,7 @@ VARIABLE_COMMENT Number of bytes used for a histogram. If set to 0, no histograms are created by ANALYZE. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 255 -@@ -1354,7 +1354,7 @@ +@@ -1434,7 +1434,7 @@ COMMAND_LINE_ARGUMENT NULL VARIABLE_NAME HOST_CACHE_SIZE VARIABLE_SCOPE GLOBAL @@ -353,7 +362,7 @@ VARIABLE_COMMENT How many host names should be cached to avoid resolving. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 65536 -@@ -1464,7 +1464,7 @@ +@@ -1544,7 +1544,7 @@ COMMAND_LINE_ARGUMENT NULL VARIABLE_NAME INTERACTIVE_TIMEOUT VARIABLE_SCOPE SESSION @@ -362,7 +371,7 @@ VARIABLE_COMMENT The number of seconds the server waits for activity on an interactive connection before closing it NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 31536000 -@@ -1497,7 +1497,7 @@ +@@ -1577,7 +1577,7 @@ VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT The size of the buffer that is used for joins NUMERIC_MIN_VALUE 128 @@ -371,7 +380,7 @@ NUMERIC_BLOCK_SIZE 128 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -1514,7 +1514,7 @@ +@@ -1594,7 +1594,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME JOIN_CACHE_LEVEL VARIABLE_SCOPE SESSION @@ -380,7 +389,7 @@ VARIABLE_COMMENT Controls what join operations can be executed with join buffers. Odd numbers are used for plain join buffers while even numbers are used for linked buffers NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 8 -@@ -1537,7 +1537,7 @@ +@@ -1617,7 +1617,7 @@ VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT The size of the buffer used for index blocks for MyISAM tables. Increase this to get better index handling (for all reads and multiple writes) to as much as you can afford NUMERIC_MIN_VALUE 0 @@ -389,7 +398,7 @@ NUMERIC_BLOCK_SIZE 4096 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -1704,7 +1704,7 @@ +@@ -1784,7 +1784,7 @@ COMMAND_LINE_ARGUMENT NULL VARIABLE_NAME LOCK_WAIT_TIMEOUT VARIABLE_SCOPE SESSION @@ -398,7 +407,7 @@ VARIABLE_COMMENT Timeout in seconds to wait for a lock before returning an error. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 31536000 -@@ -1854,7 +1854,7 @@ +@@ -1934,7 +1934,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME LOG_SLOW_MAX_WARNINGS VARIABLE_SCOPE SESSION @@ -407,7 +416,7 @@ VARIABLE_COMMENT Max numbers of warnings printed to slow query log per statement NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 1000 -@@ -1864,7 +1864,7 @@ +@@ -1944,7 +1944,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME LOG_SLOW_MIN_EXAMINED_ROW_LIMIT VARIABLE_SCOPE SESSION @@ -416,7 +425,7 @@ VARIABLE_COMMENT Don't write queries to slow log that examine fewer rows than that NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 4294967295 -@@ -1904,7 +1904,7 @@ +@@ -1984,7 +1984,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME LOG_SLOW_RATE_LIMIT VARIABLE_SCOPE SESSION @@ -425,7 +434,7 @@ VARIABLE_COMMENT Write to slow log every #th slow query. Set to 1 to log everything. Increase it to reduce the size of the slow or the performance impact of slow logging NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 4294967295 -@@ -1934,7 +1934,7 @@ +@@ -2014,7 +2014,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME LOG_WARNINGS VARIABLE_SCOPE SESSION @@ -434,7 +443,7 @@ VARIABLE_COMMENT Log some non critical warnings to the error log.Value can be between 0 and 11. Higher values mean more verbosity NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 4294967295 -@@ -1994,7 +1994,7 @@ +@@ -2074,7 +2074,7 @@ COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME MAX_ALLOWED_PACKET VARIABLE_SCOPE SESSION @@ -443,7 +452,7 @@ VARIABLE_COMMENT Max packet length to send to or receive from the server NUMERIC_MIN_VALUE 1024 NUMERIC_MAX_VALUE 1073741824 -@@ -2007,14 +2007,14 @@ +@@ -2087,14 +2087,14 @@ VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT Sets the total size of the transactional cache NUMERIC_MIN_VALUE 4096 @@ -460,7 +469,7 @@ VARIABLE_COMMENT Binary log will be rotated automatically when the size exceeds this value. NUMERIC_MIN_VALUE 4096 NUMERIC_MAX_VALUE 1073741824 -@@ -2027,14 +2027,14 @@ +@@ -2107,7 +2107,7 @@ VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT Sets the total size of the statement cache NUMERIC_MIN_VALUE 4096 @@ -469,6 +478,7 @@ NUMERIC_BLOCK_SIZE 4096 ENUM_VALUE_LIST NULL READ_ONLY NO +@@ -2124,7 +2124,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME MAX_CONNECTIONS VARIABLE_SCOPE GLOBAL @@ -477,7 +487,7 @@ VARIABLE_COMMENT The number of simultaneous clients allowed NUMERIC_MIN_VALUE 10 NUMERIC_MAX_VALUE 100000 -@@ -2044,7 +2044,7 @@ +@@ -2134,7 +2134,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME MAX_CONNECT_ERRORS VARIABLE_SCOPE GLOBAL @@ -486,7 +496,7 @@ VARIABLE_COMMENT If there is more than this number of interrupted connections from a host this host will be blocked from further connections NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 4294967295 -@@ -2054,7 +2054,7 @@ +@@ -2144,7 +2144,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME MAX_DELAYED_THREADS VARIABLE_SCOPE SESSION @@ -495,7 +505,7 @@ VARIABLE_COMMENT Don't start more than this number of threads to handle INSERT DELAYED statements. If set to zero INSERT DELAYED will be not used NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 16384 -@@ -2074,7 +2074,7 @@ +@@ -2164,7 +2164,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME MAX_ERROR_COUNT VARIABLE_SCOPE SESSION @@ -504,7 +514,7 @@ VARIABLE_COMMENT Max number of errors/warnings to store for a statement NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 65535 -@@ -2087,14 +2087,14 @@ +@@ -2177,14 +2177,14 @@ VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT Don't allow creation of heap tables bigger than this NUMERIC_MIN_VALUE 16384 @@ -521,7 +531,7 @@ VARIABLE_COMMENT Alias for max_delayed_threads. Don't start more than this number of threads to handle INSERT DELAYED statements. If set to zero INSERT DELAYED will be not used NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 16384 -@@ -2114,7 +2114,7 @@ +@@ -2204,7 +2204,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME MAX_LENGTH_FOR_SORT_DATA VARIABLE_SCOPE SESSION @@ -530,7 +540,7 @@ VARIABLE_COMMENT Max number of bytes in sorted records NUMERIC_MIN_VALUE 4 NUMERIC_MAX_VALUE 8388608 -@@ -2144,7 +2144,7 @@ +@@ -2234,7 +2234,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME MAX_RECURSIVE_ITERATIONS VARIABLE_SCOPE SESSION @@ -539,7 +549,7 @@ VARIABLE_COMMENT Maximum number of iterations when executing recursive queries NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 4294967295 -@@ -2167,14 +2167,14 @@ +@@ -2257,14 +2257,14 @@ VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT The maximum size of the container of a rowid filter NUMERIC_MIN_VALUE 1024 @@ -556,7 +566,7 @@ VARIABLE_COMMENT Limit assumed max number of seeks when looking up rows based on a key NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 4294967295 -@@ -2194,7 +2194,7 @@ +@@ -2284,7 +2284,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME MAX_SORT_LENGTH VARIABLE_SCOPE SESSION @@ -565,7 +575,7 @@ VARIABLE_COMMENT The number of bytes to use when sorting BLOB or TEXT values (only the first max_sort_length bytes of each value are used; the rest are ignored) NUMERIC_MIN_VALUE 64 NUMERIC_MAX_VALUE 8388608 -@@ -2204,7 +2204,7 @@ +@@ -2294,7 +2294,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME MAX_SP_RECURSION_DEPTH VARIABLE_SCOPE SESSION @@ -574,16 +584,7 @@ VARIABLE_COMMENT Maximum stored procedure recursion depth NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 255 -@@ -2224,7 +2224,7 @@ - COMMAND_LINE_ARGUMENT REQUIRED - VARIABLE_NAME MAX_TMP_TABLES - VARIABLE_SCOPE SESSION --VARIABLE_TYPE BIGINT UNSIGNED -+VARIABLE_TYPE INT UNSIGNED - VARIABLE_COMMENT Unused, will be removed. - NUMERIC_MIN_VALUE 1 - NUMERIC_MAX_VALUE 4294967295 -@@ -2244,7 +2244,7 @@ +@@ -2324,7 +2324,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME MAX_WRITE_LOCK_COUNT VARIABLE_SCOPE GLOBAL @@ -592,7 +593,7 @@ VARIABLE_COMMENT After this many write locks, allow some read locks to run in between NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 4294967295 -@@ -2254,7 +2254,7 @@ +@@ -2334,7 +2334,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME METADATA_LOCKS_CACHE_SIZE VARIABLE_SCOPE GLOBAL @@ -601,7 +602,7 @@ VARIABLE_COMMENT Unused NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 1048576 -@@ -2264,7 +2264,7 @@ +@@ -2344,7 +2344,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME METADATA_LOCKS_HASH_INSTANCES VARIABLE_SCOPE GLOBAL @@ -610,7 +611,7 @@ VARIABLE_COMMENT Unused NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 1024 -@@ -2274,7 +2274,7 @@ +@@ -2354,7 +2354,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME MIN_EXAMINED_ROW_LIMIT VARIABLE_SCOPE SESSION @@ -619,7 +620,7 @@ VARIABLE_COMMENT Alias for log_slow_min_examined_row_limit. Don't write queries to slow log that examine fewer rows than that NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 4294967295 -@@ -2284,7 +2284,7 @@ +@@ -2364,7 +2364,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME MRR_BUFFER_SIZE VARIABLE_SCOPE SESSION @@ -628,7 +629,7 @@ VARIABLE_COMMENT Size of buffer to use when using MRR with range access NUMERIC_MIN_VALUE 8192 NUMERIC_MAX_VALUE 2147483647 -@@ -2294,7 +2294,7 @@ +@@ -2374,7 +2374,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME MYISAM_BLOCK_SIZE VARIABLE_SCOPE GLOBAL @@ -637,7 +638,7 @@ VARIABLE_COMMENT Block size to be used for MyISAM index pages NUMERIC_MIN_VALUE 1024 NUMERIC_MAX_VALUE 16384 -@@ -2304,7 +2304,7 @@ +@@ -2384,7 +2384,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME MYISAM_DATA_POINTER_SIZE VARIABLE_SCOPE GLOBAL @@ -646,7 +647,7 @@ VARIABLE_COMMENT Default pointer size to be used for MyISAM tables NUMERIC_MIN_VALUE 2 NUMERIC_MAX_VALUE 7 -@@ -2327,7 +2327,7 @@ +@@ -2407,7 +2407,7 @@ VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT Restricts the total memory used for memory mapping of MySQL tables NUMERIC_MIN_VALUE 7 @@ -655,7 +656,7 @@ NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL READ_ONLY YES -@@ -2344,10 +2344,10 @@ +@@ -2424,10 +2424,10 @@ COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME MYISAM_REPAIR_THREADS VARIABLE_SCOPE SESSION @@ -668,7 +669,7 @@ NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -2357,7 +2357,7 @@ +@@ -2437,7 +2437,7 @@ VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT The buffer that is allocated when sorting the index when doing a REPAIR or when creating indexes with CREATE INDEX or ALTER TABLE NUMERIC_MIN_VALUE 4096 @@ -677,7 +678,7 @@ NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -2394,7 +2394,7 @@ +@@ -2474,7 +2474,7 @@ COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME NET_BUFFER_LENGTH VARIABLE_SCOPE SESSION @@ -686,7 +687,7 @@ VARIABLE_COMMENT Buffer length for TCP/IP and socket communication NUMERIC_MIN_VALUE 1024 NUMERIC_MAX_VALUE 1048576 -@@ -2404,7 +2404,7 @@ +@@ -2484,7 +2484,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME NET_READ_TIMEOUT VARIABLE_SCOPE SESSION @@ -695,7 +696,7 @@ VARIABLE_COMMENT Number of seconds to wait for more data from a connection before aborting the read NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 31536000 -@@ -2414,7 +2414,7 @@ +@@ -2494,7 +2494,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME NET_RETRY_COUNT VARIABLE_SCOPE SESSION @@ -704,7 +705,7 @@ VARIABLE_COMMENT If a read on a communication port is interrupted, retry this many times before giving up NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 4294967295 -@@ -2424,7 +2424,7 @@ +@@ -2504,7 +2504,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME NET_WRITE_TIMEOUT VARIABLE_SCOPE SESSION @@ -713,7 +714,7 @@ VARIABLE_COMMENT Number of seconds to wait for a block to be written to a connection before aborting the write NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 31536000 -@@ -2484,7 +2484,7 @@ +@@ -2554,7 +2554,7 @@ COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME OPEN_FILES_LIMIT VARIABLE_SCOPE GLOBAL @@ -722,16 +723,16 @@ VARIABLE_COMMENT If this is not 0, then mysqld will use this value to reserve file descriptors to use with setrlimit(). If this value is 0 or autoset then mysqld will reserve max_connections*5 or max_connections + table_cache*2 (whichever is larger) number of file descriptors NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 4294967295 -@@ -2494,7 +2494,7 @@ +@@ -2564,7 +2564,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME OPTIMIZER_ADJUST_SECONDARY_KEY_COSTS VARIABLE_SCOPE SESSION -VARIABLE_TYPE BIGINT UNSIGNED +VARIABLE_TYPE INT UNSIGNED - VARIABLE_COMMENT 0 = No changes. 1 = Update secondary key costs for ranges to be at least 5x of clustered primary key costs. 2 = Remove 'max_seek optimization' for secondary keys and slight adjustment of filter cost. This option will be deleted in MariaDB 11.0 as it is not needed with the new 11.0 optimizer. + VARIABLE_COMMENT Unused, will be removed. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 2 -@@ -2504,7 +2504,7 @@ +@@ -2594,7 +2594,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME OPTIMIZER_EXTRA_PRUNING_DEPTH VARIABLE_SCOPE SESSION @@ -740,7 +741,7 @@ VARIABLE_COMMENT If the optimizer needs to enumerate join prefix of this size or larger, then it will try aggressively prune away the search space. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 62 -@@ -2514,7 +2514,7 @@ +@@ -2654,7 +2654,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME OPTIMIZER_MAX_SEL_ARGS VARIABLE_SCOPE SESSION @@ -749,7 +750,7 @@ VARIABLE_COMMENT The maximum number of SEL_ARG objects created when optimizing a range. If more objects would be needed, the range will not be used by the optimizer. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 4294967295 -@@ -2524,7 +2524,7 @@ +@@ -2664,7 +2664,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME OPTIMIZER_MAX_SEL_ARG_WEIGHT VARIABLE_SCOPE SESSION @@ -758,7 +759,7 @@ VARIABLE_COMMENT The maximum weight of the SEL_ARG graph. Set to 0 for no limit NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 4294967295 -@@ -2534,7 +2534,7 @@ +@@ -2674,7 +2674,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME OPTIMIZER_PRUNE_LEVEL VARIABLE_SCOPE SESSION @@ -767,7 +768,7 @@ VARIABLE_COMMENT Controls the heuristic(s) applied during query optimization to prune less-promising partial plans from the optimizer search space. Meaning: 0 - do not apply any heuristic, thus perform exhaustive search: 1 - prune plans based on cost and number of retrieved rows eq_ref: 2 - prune also if we find an eq_ref chain NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 2 -@@ -2544,7 +2544,7 @@ +@@ -2744,7 +2744,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME OPTIMIZER_SEARCH_DEPTH VARIABLE_SCOPE SESSION @@ -776,7 +777,7 @@ VARIABLE_COMMENT Maximum depth of search performed by the query optimizer. Values larger than the number of relations in a query result in better query plans, but take longer to compile a query. Values smaller than the number of tables in a relation result in faster optimization, but may produce very bad query plans. If set to 0, the system will automatically pick a reasonable value. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 62 -@@ -2554,7 +2554,7 @@ +@@ -2754,7 +2754,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME OPTIMIZER_SELECTIVITY_SAMPLING_LIMIT VARIABLE_SCOPE SESSION @@ -785,7 +786,7 @@ VARIABLE_COMMENT Controls number of record samples to check condition selectivity NUMERIC_MIN_VALUE 10 NUMERIC_MAX_VALUE 4294967295 -@@ -2584,17 +2584,17 @@ +@@ -2784,17 +2784,17 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME OPTIMIZER_TRACE_MAX_MEM_SIZE VARIABLE_SCOPE SESSION @@ -806,7 +807,7 @@ VARIABLE_COMMENT Controls selectivity of which conditions the optimizer takes into account to calculate cardinality of a partial join when it searches for the best execution plan Meaning: 1 - use selectivity of index backed range conditions to calculate the cardinality of a partial join if the last joined table is accessed by full table scan or an index scan, 2 - use selectivity of index backed range conditions to calculate the cardinality of a partial join in any case, 3 - additionally always use selectivity of range conditions that are not backed by any index to calculate the cardinality of a partial join, 4 - use histograms to calculate selectivity of range conditions that are not backed by any index to calculate the cardinality of a partial join.5 - additionally use selectivity of certain non-range predicates calculated on record samples NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 5 -@@ -2614,7 +2614,7 @@ +@@ -2824,7 +2824,7 @@ COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME PERFORMANCE_SCHEMA_ACCOUNTS_SIZE VARIABLE_SCOPE GLOBAL @@ -815,7 +816,7 @@ VARIABLE_COMMENT Maximum number of instrumented user@host accounts. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1048576 -@@ -2624,7 +2624,7 @@ +@@ -2834,7 +2834,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_DIGESTS_SIZE VARIABLE_SCOPE GLOBAL @@ -824,7 +825,7 @@ VARIABLE_COMMENT Size of the statement digest. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1048576 -@@ -2634,7 +2634,7 @@ +@@ -2844,7 +2844,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_EVENTS_STAGES_HISTORY_LONG_SIZE VARIABLE_SCOPE GLOBAL @@ -833,7 +834,7 @@ VARIABLE_COMMENT Number of rows in EVENTS_STAGES_HISTORY_LONG. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1048576 -@@ -2644,7 +2644,7 @@ +@@ -2854,7 +2854,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_EVENTS_STAGES_HISTORY_SIZE VARIABLE_SCOPE GLOBAL @@ -842,7 +843,7 @@ VARIABLE_COMMENT Number of rows per thread in EVENTS_STAGES_HISTORY. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1024 -@@ -2654,7 +2654,7 @@ +@@ -2864,7 +2864,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_EVENTS_STATEMENTS_HISTORY_LONG_SIZE VARIABLE_SCOPE GLOBAL @@ -851,7 +852,7 @@ VARIABLE_COMMENT Number of rows in EVENTS_STATEMENTS_HISTORY_LONG. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1048576 -@@ -2664,7 +2664,7 @@ +@@ -2874,7 +2874,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_EVENTS_STATEMENTS_HISTORY_SIZE VARIABLE_SCOPE GLOBAL @@ -860,7 +861,7 @@ VARIABLE_COMMENT Number of rows per thread in EVENTS_STATEMENTS_HISTORY. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1024 -@@ -2674,7 +2674,7 @@ +@@ -2884,7 +2884,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_EVENTS_TRANSACTIONS_HISTORY_LONG_SIZE VARIABLE_SCOPE GLOBAL @@ -869,7 +870,7 @@ VARIABLE_COMMENT Number of rows in EVENTS_TRANSACTIONS_HISTORY_LONG. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1048576 -@@ -2684,7 +2684,7 @@ +@@ -2894,7 +2894,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_EVENTS_TRANSACTIONS_HISTORY_SIZE VARIABLE_SCOPE GLOBAL @@ -878,7 +879,7 @@ VARIABLE_COMMENT Number of rows per thread in EVENTS_TRANSACTIONS_HISTORY. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1024 -@@ -2694,7 +2694,7 @@ +@@ -2904,7 +2904,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_EVENTS_WAITS_HISTORY_LONG_SIZE VARIABLE_SCOPE GLOBAL @@ -887,7 +888,7 @@ VARIABLE_COMMENT Number of rows in EVENTS_WAITS_HISTORY_LONG. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1048576 -@@ -2704,7 +2704,7 @@ +@@ -2914,7 +2914,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_EVENTS_WAITS_HISTORY_SIZE VARIABLE_SCOPE GLOBAL @@ -896,7 +897,7 @@ VARIABLE_COMMENT Number of rows per thread in EVENTS_WAITS_HISTORY. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1024 -@@ -2714,7 +2714,7 @@ +@@ -2924,7 +2924,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_HOSTS_SIZE VARIABLE_SCOPE GLOBAL @@ -905,7 +906,7 @@ VARIABLE_COMMENT Maximum number of instrumented hosts. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1048576 -@@ -2724,7 +2724,7 @@ +@@ -2934,7 +2934,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_COND_CLASSES VARIABLE_SCOPE GLOBAL @@ -914,7 +915,7 @@ VARIABLE_COMMENT Maximum number of condition instruments. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 256 -@@ -2734,7 +2734,7 @@ +@@ -2944,7 +2944,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_COND_INSTANCES VARIABLE_SCOPE GLOBAL @@ -923,7 +924,7 @@ VARIABLE_COMMENT Maximum number of instrumented condition objects. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1048576 -@@ -2744,7 +2744,7 @@ +@@ -2954,7 +2954,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_DIGEST_LENGTH VARIABLE_SCOPE GLOBAL @@ -932,7 +933,7 @@ VARIABLE_COMMENT Maximum length considered for digest text, when stored in performance_schema tables. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 1048576 -@@ -2754,7 +2754,7 @@ +@@ -2964,7 +2964,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_FILE_CLASSES VARIABLE_SCOPE GLOBAL @@ -941,7 +942,7 @@ VARIABLE_COMMENT Maximum number of file instruments. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 256 -@@ -2764,7 +2764,7 @@ +@@ -2974,7 +2974,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_FILE_HANDLES VARIABLE_SCOPE GLOBAL @@ -950,7 +951,7 @@ VARIABLE_COMMENT Maximum number of opened instrumented files. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 1048576 -@@ -2774,7 +2774,7 @@ +@@ -2984,7 +2984,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_FILE_INSTANCES VARIABLE_SCOPE GLOBAL @@ -959,7 +960,7 @@ VARIABLE_COMMENT Maximum number of instrumented files. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1048576 -@@ -2784,7 +2784,7 @@ +@@ -2994,7 +2994,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_INDEX_STAT VARIABLE_SCOPE GLOBAL @@ -968,7 +969,7 @@ VARIABLE_COMMENT Maximum number of index statistics for instrumented tables. Use 0 to disable, -1 for automated scaling. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1048576 -@@ -2794,7 +2794,7 @@ +@@ -3004,7 +3004,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_MEMORY_CLASSES VARIABLE_SCOPE GLOBAL @@ -977,7 +978,7 @@ VARIABLE_COMMENT Maximum number of memory pool instruments. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 1024 -@@ -2804,7 +2804,7 @@ +@@ -3014,7 +3014,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_METADATA_LOCKS VARIABLE_SCOPE GLOBAL @@ -986,7 +987,7 @@ VARIABLE_COMMENT Maximum number of metadata locks. Use 0 to disable, -1 for automated scaling. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 104857600 -@@ -2814,7 +2814,7 @@ +@@ -3024,7 +3024,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_MUTEX_CLASSES VARIABLE_SCOPE GLOBAL @@ -995,7 +996,7 @@ VARIABLE_COMMENT Maximum number of mutex instruments. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 256 -@@ -2824,7 +2824,7 @@ +@@ -3034,7 +3034,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_MUTEX_INSTANCES VARIABLE_SCOPE GLOBAL @@ -1004,7 +1005,7 @@ VARIABLE_COMMENT Maximum number of instrumented MUTEX objects. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 104857600 -@@ -2834,7 +2834,7 @@ +@@ -3044,7 +3044,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_PREPARED_STATEMENTS_INSTANCES VARIABLE_SCOPE GLOBAL @@ -1013,7 +1014,7 @@ VARIABLE_COMMENT Maximum number of instrumented prepared statements. Use 0 to disable, -1 for automated scaling. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1048576 -@@ -2844,7 +2844,7 @@ +@@ -3054,7 +3054,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_PROGRAM_INSTANCES VARIABLE_SCOPE GLOBAL @@ -1022,7 +1023,7 @@ VARIABLE_COMMENT Maximum number of instrumented programs. Use 0 to disable, -1 for automated scaling. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1048576 -@@ -2854,7 +2854,7 @@ +@@ -3064,7 +3064,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_RWLOCK_CLASSES VARIABLE_SCOPE GLOBAL @@ -1031,7 +1032,7 @@ VARIABLE_COMMENT Maximum number of rwlock instruments. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 256 -@@ -2864,7 +2864,7 @@ +@@ -3074,7 +3074,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_RWLOCK_INSTANCES VARIABLE_SCOPE GLOBAL @@ -1040,7 +1041,7 @@ VARIABLE_COMMENT Maximum number of instrumented RWLOCK objects. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 104857600 -@@ -2874,7 +2874,7 @@ +@@ -3084,7 +3084,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_SOCKET_CLASSES VARIABLE_SCOPE GLOBAL @@ -1049,7 +1050,7 @@ VARIABLE_COMMENT Maximum number of socket instruments. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 256 -@@ -2884,7 +2884,7 @@ +@@ -3094,7 +3094,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_SOCKET_INSTANCES VARIABLE_SCOPE GLOBAL @@ -1058,7 +1059,7 @@ VARIABLE_COMMENT Maximum number of opened instrumented sockets. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1048576 -@@ -2894,7 +2894,7 @@ +@@ -3104,7 +3104,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_SQL_TEXT_LENGTH VARIABLE_SCOPE GLOBAL @@ -1067,7 +1068,7 @@ VARIABLE_COMMENT Maximum length of displayed sql text. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 1048576 -@@ -2904,7 +2904,7 @@ +@@ -3114,7 +3114,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_STAGE_CLASSES VARIABLE_SCOPE GLOBAL @@ -1076,7 +1077,7 @@ VARIABLE_COMMENT Maximum number of stage instruments. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 256 -@@ -2914,7 +2914,7 @@ +@@ -3124,7 +3124,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_STATEMENT_CLASSES VARIABLE_SCOPE GLOBAL @@ -1085,7 +1086,7 @@ VARIABLE_COMMENT Maximum number of statement instruments. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 256 -@@ -2924,7 +2924,7 @@ +@@ -3134,7 +3134,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_STATEMENT_STACK VARIABLE_SCOPE GLOBAL @@ -1094,7 +1095,7 @@ VARIABLE_COMMENT Number of rows per thread in EVENTS_STATEMENTS_CURRENT. NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 256 -@@ -2934,7 +2934,7 @@ +@@ -3144,7 +3144,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_TABLE_HANDLES VARIABLE_SCOPE GLOBAL @@ -1103,7 +1104,7 @@ VARIABLE_COMMENT Maximum number of opened instrumented tables. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1048576 -@@ -2944,7 +2944,7 @@ +@@ -3154,7 +3154,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_TABLE_INSTANCES VARIABLE_SCOPE GLOBAL @@ -1112,7 +1113,7 @@ VARIABLE_COMMENT Maximum number of instrumented tables. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1048576 -@@ -2954,7 +2954,7 @@ +@@ -3164,7 +3164,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_TABLE_LOCK_STAT VARIABLE_SCOPE GLOBAL @@ -1121,7 +1122,7 @@ VARIABLE_COMMENT Maximum number of lock statistics for instrumented tables. Use 0 to disable, -1 for automated scaling. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1048576 -@@ -2964,7 +2964,7 @@ +@@ -3174,7 +3174,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_THREAD_CLASSES VARIABLE_SCOPE GLOBAL @@ -1130,7 +1131,7 @@ VARIABLE_COMMENT Maximum number of thread instruments. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 256 -@@ -2974,7 +2974,7 @@ +@@ -3184,7 +3184,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_THREAD_INSTANCES VARIABLE_SCOPE GLOBAL @@ -1139,7 +1140,7 @@ VARIABLE_COMMENT Maximum number of instrumented threads. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1048576 -@@ -2984,7 +2984,7 @@ +@@ -3194,7 +3194,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_SESSION_CONNECT_ATTRS_SIZE VARIABLE_SCOPE GLOBAL @@ -1148,7 +1149,7 @@ VARIABLE_COMMENT Size of session attribute string buffer per thread. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1048576 -@@ -2994,7 +2994,7 @@ +@@ -3204,7 +3204,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_SETUP_ACTORS_SIZE VARIABLE_SCOPE GLOBAL @@ -1157,7 +1158,7 @@ VARIABLE_COMMENT Maximum number of rows in SETUP_ACTORS. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1024 -@@ -3004,7 +3004,7 @@ +@@ -3214,7 +3214,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_SETUP_OBJECTS_SIZE VARIABLE_SCOPE GLOBAL @@ -1166,7 +1167,7 @@ VARIABLE_COMMENT Maximum number of rows in SETUP_OBJECTS. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1048576 -@@ -3014,7 +3014,7 @@ +@@ -3224,7 +3224,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_USERS_SIZE VARIABLE_SCOPE GLOBAL @@ -1175,7 +1176,7 @@ VARIABLE_COMMENT Maximum number of instrumented users. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1048576 -@@ -3064,7 +3064,7 @@ +@@ -3274,7 +3274,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PRELOAD_BUFFER_SIZE VARIABLE_SCOPE SESSION @@ -1184,7 +1185,7 @@ VARIABLE_COMMENT The size of the buffer that is allocated when preloading indexes NUMERIC_MIN_VALUE 1024 NUMERIC_MAX_VALUE 1073741824 -@@ -3084,7 +3084,7 @@ +@@ -3294,7 +3294,7 @@ COMMAND_LINE_ARGUMENT NULL VARIABLE_NAME PROFILING_HISTORY_SIZE VARIABLE_SCOPE SESSION @@ -1193,7 +1194,7 @@ VARIABLE_COMMENT Number of statements about which profiling information is maintained. If set to 0, no profiles are stored. See SHOW PROFILES. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 100 -@@ -3094,7 +3094,7 @@ +@@ -3304,7 +3304,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PROGRESS_REPORT_TIME VARIABLE_SCOPE SESSION @@ -1202,7 +1203,7 @@ VARIABLE_COMMENT Seconds between sending progress reports to the client for time-consuming statements. Set to 0 to disable progress reporting. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 4294967295 -@@ -3154,7 +3154,7 @@ +@@ -3364,7 +3364,7 @@ COMMAND_LINE_ARGUMENT NULL VARIABLE_NAME QUERY_ALLOC_BLOCK_SIZE VARIABLE_SCOPE SESSION @@ -1211,7 +1212,7 @@ VARIABLE_COMMENT Allocation block size for query parsing and execution NUMERIC_MIN_VALUE 1024 NUMERIC_MAX_VALUE 4294967295 -@@ -3164,7 +3164,7 @@ +@@ -3374,7 +3374,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME QUERY_CACHE_LIMIT VARIABLE_SCOPE GLOBAL @@ -1220,7 +1221,7 @@ VARIABLE_COMMENT Don't cache results that are bigger than this NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 4294967295 -@@ -3174,7 +3174,7 @@ +@@ -3384,7 +3384,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME QUERY_CACHE_MIN_RES_UNIT VARIABLE_SCOPE GLOBAL @@ -1229,7 +1230,7 @@ VARIABLE_COMMENT The minimum size for blocks allocated by the query cache NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 4294967295 -@@ -3187,7 +3187,7 @@ +@@ -3397,7 +3397,7 @@ VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT The memory allocated to store results from old queries NUMERIC_MIN_VALUE 0 @@ -1238,7 +1239,7 @@ NUMERIC_BLOCK_SIZE 1024 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -3224,7 +3224,7 @@ +@@ -3434,7 +3434,7 @@ COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME QUERY_PREALLOC_SIZE VARIABLE_SCOPE SESSION @@ -1247,7 +1248,7 @@ VARIABLE_COMMENT Persistent buffer for query parsing and execution NUMERIC_MIN_VALUE 1024 NUMERIC_MAX_VALUE 4294967295 -@@ -3237,7 +3237,7 @@ +@@ -3447,7 +3447,7 @@ VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT Sets the internal state of the RAND() generator for replication purposes NUMERIC_MIN_VALUE 0 @@ -1256,7 +1257,7 @@ NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -3247,14 +3247,14 @@ +@@ -3457,14 +3457,14 @@ VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT Sets the internal state of the RAND() generator for replication purposes NUMERIC_MIN_VALUE 0 @@ -1273,7 +1274,7 @@ VARIABLE_COMMENT Allocation block size for storing ranges during optimization NUMERIC_MIN_VALUE 4096 NUMERIC_MAX_VALUE 4294967295 -@@ -3267,14 +3267,14 @@ +@@ -3477,14 +3477,14 @@ VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT Maximum speed(KB/s) to read binlog from master (0 = no limit) NUMERIC_MIN_VALUE 0 @@ -1290,7 +1291,7 @@ VARIABLE_COMMENT Each thread that does a sequential scan allocates a buffer of this size for each table it scans. If you do many sequential scans, you may want to increase this value NUMERIC_MIN_VALUE 8192 NUMERIC_MAX_VALUE 2147483647 -@@ -3294,7 +3294,7 @@ +@@ -3504,7 +3504,7 @@ COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME READ_RND_BUFFER_SIZE VARIABLE_SCOPE SESSION @@ -1299,7 +1300,7 @@ VARIABLE_COMMENT When reading rows in sorted order after a sort, the rows are read through this buffer to avoid a disk seeks NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 2147483647 -@@ -3514,10 +3514,10 @@ +@@ -3734,10 +3734,10 @@ COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME ROWID_MERGE_BUFF_SIZE VARIABLE_SCOPE SESSION @@ -1312,7 +1313,7 @@ NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -3534,20 +3534,20 @@ +@@ -3754,20 +3754,20 @@ COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME RPL_SEMI_SYNC_MASTER_TIMEOUT VARIABLE_SCOPE GLOBAL @@ -1337,7 +1338,7 @@ NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -3604,10 +3604,10 @@ +@@ -3824,10 +3824,10 @@ COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME RPL_SEMI_SYNC_SLAVE_TRACE_LEVEL VARIABLE_SCOPE GLOBAL @@ -1350,7 +1351,7 @@ NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -3644,7 +3644,7 @@ +@@ -3864,7 +3864,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME SERVER_ID VARIABLE_SCOPE SESSION @@ -1359,7 +1360,7 @@ VARIABLE_COMMENT Uniquely identifies the server instance in the community of replication partners NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 4294967295 -@@ -3784,7 +3784,7 @@ +@@ -4014,7 +4014,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME SLAVE_DOMAIN_PARALLEL_THREADS VARIABLE_SCOPE GLOBAL @@ -1368,7 +1369,7 @@ VARIABLE_COMMENT Maximum number of parallel threads to use on slave for events in a single replication domain. When using multiple domains, this can be used to limit a single domain from grabbing all threads and thus stalling other domains. The default of 0 means to allow a domain to grab as many threads as it wants, up to the value of slave_parallel_threads. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 16383 -@@ -3814,7 +3814,7 @@ +@@ -4044,7 +4044,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME SLAVE_MAX_ALLOWED_PACKET VARIABLE_SCOPE GLOBAL @@ -1377,7 +1378,7 @@ VARIABLE_COMMENT The maximum packet length to sent successfully from the master to slave. NUMERIC_MIN_VALUE 1024 NUMERIC_MAX_VALUE 1073741824 -@@ -3844,7 +3844,7 @@ +@@ -4074,7 +4074,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME SLAVE_PARALLEL_MAX_QUEUED VARIABLE_SCOPE GLOBAL @@ -1386,7 +1387,7 @@ VARIABLE_COMMENT Limit on how much memory SQL threads should use per parallel replication thread when reading ahead in the relay log looking for opportunities for parallel replication. Only used when --slave-parallel-threads > 0. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 2147483647 -@@ -3864,7 +3864,7 @@ +@@ -4094,7 +4094,7 @@ COMMAND_LINE_ARGUMENT NULL VARIABLE_NAME SLAVE_PARALLEL_THREADS VARIABLE_SCOPE GLOBAL @@ -1395,7 +1396,7 @@ VARIABLE_COMMENT If non-zero, number of threads to spawn to apply in parallel events on the slave that were group-committed on the master or were logged with GTID in different replication domains. Note that these threads are in addition to the IO and SQL threads, which are always created by a replication slave NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 16383 -@@ -3874,7 +3874,7 @@ +@@ -4104,7 +4104,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME SLAVE_PARALLEL_WORKERS VARIABLE_SCOPE GLOBAL @@ -1404,7 +1405,7 @@ VARIABLE_COMMENT Alias for slave_parallel_threads NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 16383 -@@ -3914,7 +3914,7 @@ +@@ -4144,7 +4144,7 @@ COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME SLAVE_TRANSACTION_RETRIES VARIABLE_SCOPE GLOBAL @@ -1413,7 +1414,7 @@ VARIABLE_COMMENT Number of times the slave SQL thread will retry a transaction in case it failed with a deadlock, elapsed lock wait timeout or listed in slave_transaction_retry_errors, before giving up and stopping NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 4294967295 -@@ -3934,7 +3934,7 @@ +@@ -4164,7 +4164,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME SLAVE_TRANSACTION_RETRY_INTERVAL VARIABLE_SCOPE GLOBAL @@ -1422,7 +1423,7 @@ VARIABLE_COMMENT Interval of the slave SQL thread will retry a transaction in case it failed with a deadlock or elapsed lock wait timeout or listed in slave_transaction_retry_errors NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 3600 -@@ -3954,7 +3954,7 @@ +@@ -4184,7 +4184,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME SLOW_LAUNCH_TIME VARIABLE_SCOPE GLOBAL @@ -1431,7 +1432,7 @@ VARIABLE_COMMENT If creating the thread takes longer than this value (in seconds), the Slow_launch_threads counter will be incremented NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 31536000 -@@ -3997,7 +3997,7 @@ +@@ -4227,7 +4227,7 @@ VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT Each thread that needs to do a sort allocates a buffer of this size NUMERIC_MIN_VALUE 1024 @@ -1440,7 +1441,7 @@ NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -4224,7 +4224,7 @@ +@@ -4454,7 +4454,7 @@ COMMAND_LINE_ARGUMENT NULL VARIABLE_NAME STORED_PROGRAM_CACHE VARIABLE_SCOPE GLOBAL @@ -1449,7 +1450,7 @@ VARIABLE_COMMENT The soft upper limit for number of cached stored routines for one connection. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 524288 -@@ -4334,7 +4334,7 @@ +@@ -4564,7 +4564,7 @@ COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME TABLE_DEFINITION_CACHE VARIABLE_SCOPE GLOBAL @@ -1458,7 +1459,7 @@ VARIABLE_COMMENT The number of cached table definitions NUMERIC_MIN_VALUE 400 NUMERIC_MAX_VALUE 2097152 -@@ -4344,7 +4344,7 @@ +@@ -4574,7 +4574,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME TABLE_OPEN_CACHE VARIABLE_SCOPE GLOBAL @@ -1467,7 +1468,7 @@ VARIABLE_COMMENT The number of cached open tables NUMERIC_MIN_VALUE 10 NUMERIC_MAX_VALUE 1048576 -@@ -4404,7 +4404,7 @@ +@@ -4634,7 +4634,7 @@ COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME THREAD_CACHE_SIZE VARIABLE_SCOPE GLOBAL @@ -1476,7 +1477,7 @@ VARIABLE_COMMENT How many threads we should keep in a cache for reuse. These are freed after 5 minutes of idle time NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 16384 -@@ -4577,7 +4577,7 @@ +@@ -4797,7 +4797,7 @@ VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT Max size for data for an internal temporary on-disk MyISAM or Aria table. NUMERIC_MIN_VALUE 1024 @@ -1485,7 +1486,7 @@ NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -4587,7 +4587,7 @@ +@@ -4807,7 +4807,7 @@ VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT If an internal in-memory temporary table exceeds this size, MariaDB will automatically convert it to an on-disk MyISAM or Aria table. Same as tmp_table_size. NUMERIC_MIN_VALUE 0 @@ -1494,7 +1495,7 @@ NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -4597,14 +4597,14 @@ +@@ -4817,14 +4817,14 @@ VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT Alias for tmp_memory_table_size. If an internal in-memory temporary table exceeds this size, MariaDB will automatically convert it to an on-disk MyISAM or Aria table. NUMERIC_MIN_VALUE 0 @@ -1511,8 +1512,8 @@ VARIABLE_COMMENT Allocation block size for transactions to be stored in binary log NUMERIC_MIN_VALUE 1024 NUMERIC_MAX_VALUE 134217728 -@@ -4614,7 +4614,7 @@ - COMMAND_LINE_ARGUMENT REQUIRED +@@ -4844,7 +4844,7 @@ + COMMAND_LINE_ARGUMENT NULL VARIABLE_NAME TRANSACTION_PREALLOC_SIZE VARIABLE_SCOPE SESSION -VARIABLE_TYPE BIGINT UNSIGNED @@ -1520,7 +1521,7 @@ VARIABLE_COMMENT Persistent buffer for transactions to be stored in binary log NUMERIC_MIN_VALUE 1024 NUMERIC_MAX_VALUE 134217728 -@@ -4754,7 +4754,7 @@ +@@ -4994,7 +4994,7 @@ COMMAND_LINE_ARGUMENT NULL VARIABLE_NAME WAIT_TIMEOUT VARIABLE_SCOPE SESSION @@ -1529,7 +1530,7 @@ VARIABLE_COMMENT The number of seconds the server waits for activity on a connection before closing it NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 31536000 -@@ -4781,7 +4781,7 @@ +@@ -5021,7 +5021,7 @@ VARIABLE_NAME LOG_TC_SIZE GLOBAL_VALUE_ORIGIN AUTO VARIABLE_SCOPE GLOBAL diff --git a/mysql-test/suite/sys_vars/r/sysvars_server_notembedded,aix.rdiff b/mysql-test/suite/sys_vars/r/sysvars_server_notembedded,aix.rdiff index 3fd27356..262be557 100644 --- a/mysql-test/suite/sys_vars/r/sysvars_server_notembedded,aix.rdiff +++ b/mysql-test/suite/sys_vars/r/sysvars_server_notembedded,aix.rdiff @@ -1,8 +1,6 @@ -diff --git a/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result b/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result -index bb3378139f2..ddab28508ec 100644 --- a/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result +++ b/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result -@@ -4259,99 +4259,9 @@ VARIABLE_COMMENT Define threads usage for handling queries +@@ -4639,99 +4639,9 @@ NUMERIC_MIN_VALUE NULL NUMERIC_MAX_VALUE NULL NUMERIC_BLOCK_SIZE NULL diff --git a/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result b/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result index 2c31e5f5..2740319d 100644 --- a/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result +++ b/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result @@ -412,6 +412,16 @@ NUMERIC_BLOCK_SIZE NULL ENUM_VALUE_LIST OFF,ON READ_ONLY NO COMMAND_LINE_ARGUMENT OPTIONAL +VARIABLE_NAME BINLOG_DO_DB +VARIABLE_SCOPE GLOBAL +VARIABLE_TYPE VARCHAR +VARIABLE_COMMENT Tells the primary it should log updates for the specified database, and exclude all others not explicitly mentioned. +NUMERIC_MIN_VALUE NULL +NUMERIC_MAX_VALUE NULL +NUMERIC_BLOCK_SIZE NULL +ENUM_VALUE_LIST NULL +READ_ONLY YES +COMMAND_LINE_ARGUMENT NULL VARIABLE_NAME BINLOG_EXPIRE_LOGS_SECONDS VARIABLE_SCOPE GLOBAL VARIABLE_TYPE BIGINT UNSIGNED @@ -442,6 +452,56 @@ NUMERIC_BLOCK_SIZE NULL ENUM_VALUE_LIST MIXED,STATEMENT,ROW READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED +VARIABLE_NAME BINLOG_GTID_INDEX +VARIABLE_SCOPE GLOBAL +VARIABLE_TYPE BOOLEAN +VARIABLE_COMMENT Enable the creation of a GTID index for every binlog file, and the use of such index for speeding up GTID lookup in the binlog. +NUMERIC_MIN_VALUE NULL +NUMERIC_MAX_VALUE NULL +NUMERIC_BLOCK_SIZE NULL +ENUM_VALUE_LIST OFF,ON +READ_ONLY NO +COMMAND_LINE_ARGUMENT OPTIONAL +VARIABLE_NAME BINLOG_GTID_INDEX_PAGE_SIZE +VARIABLE_SCOPE GLOBAL +VARIABLE_TYPE INT UNSIGNED +VARIABLE_COMMENT Page size to use for the binlog GTID index. +NUMERIC_MIN_VALUE 64 +NUMERIC_MAX_VALUE 16777216 +NUMERIC_BLOCK_SIZE 1 +ENUM_VALUE_LIST NULL +READ_ONLY NO +COMMAND_LINE_ARGUMENT REQUIRED +VARIABLE_NAME BINLOG_GTID_INDEX_SPAN_MIN +VARIABLE_SCOPE GLOBAL +VARIABLE_TYPE INT UNSIGNED +VARIABLE_COMMENT Control sparseness of the binlog GTID index. If set to N, at most one index record will be added for every N bytes of binlog file written, to reduce the size of the index. Normally does not need tuning. +NUMERIC_MIN_VALUE 1 +NUMERIC_MAX_VALUE 1073741824 +NUMERIC_BLOCK_SIZE 1 +ENUM_VALUE_LIST NULL +READ_ONLY NO +COMMAND_LINE_ARGUMENT REQUIRED +VARIABLE_NAME BINLOG_IGNORE_DB +VARIABLE_SCOPE GLOBAL +VARIABLE_TYPE VARCHAR +VARIABLE_COMMENT Tells the primary that updates to the given database should not be logged to the binary log. +NUMERIC_MIN_VALUE NULL +NUMERIC_MAX_VALUE NULL +NUMERIC_BLOCK_SIZE NULL +ENUM_VALUE_LIST NULL +READ_ONLY YES +COMMAND_LINE_ARGUMENT NULL +VARIABLE_NAME BINLOG_LEGACY_EVENT_POS +VARIABLE_SCOPE GLOBAL +VARIABLE_TYPE BOOLEAN +VARIABLE_COMMENT Fill in the end_log_pos field of _all_ events in the binlog, even when doing so costs performance. Can be used in case some old application needs it for backwards compatibility. Setting this option can hurt binlog scalability. +NUMERIC_MIN_VALUE NULL +NUMERIC_MAX_VALUE NULL +NUMERIC_BLOCK_SIZE NULL +ENUM_VALUE_LIST OFF,ON +READ_ONLY NO +COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME BINLOG_OPTIMIZE_THREAD_SCHEDULING VARIABLE_SCOPE GLOBAL VARIABLE_TYPE BOOLEAN @@ -452,14 +512,24 @@ NUMERIC_BLOCK_SIZE NULL ENUM_VALUE_LIST OFF,ON READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED +VARIABLE_NAME BINLOG_ROW_EVENT_MAX_SIZE +VARIABLE_SCOPE GLOBAL +VARIABLE_TYPE BIGINT UNSIGNED +VARIABLE_COMMENT The maximum size of a row-based binary log event in bytes. Rows will be grouped into events smaller than this size if possible. The value has to be a multiple of 256. +NUMERIC_MIN_VALUE 256 +NUMERIC_MAX_VALUE 4294967040 +NUMERIC_BLOCK_SIZE 256 +ENUM_VALUE_LIST NULL +READ_ONLY YES +COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME BINLOG_ROW_IMAGE VARIABLE_SCOPE SESSION VARIABLE_TYPE ENUM -VARIABLE_COMMENT Controls whether rows should be logged in 'FULL', 'NOBLOB' or 'MINIMAL' formats. 'FULL', means that all columns in the before and after image are logged. 'NOBLOB', means that mysqld avoids logging blob columns whenever possible (eg, blob column was not changed or is not part of primary key). 'MINIMAL', means that a PK equivalent (PK columns or full row if there is no PK in the table) is logged in the before image, and only changed columns are logged in the after image. (Default: FULL). +VARIABLE_COMMENT Controls whether rows should be logged in 'FULL', 'FULL_NODUP', 'NOBLOB' or 'MINIMAL' formats. 'FULL', means that all columns in the before and after image are logged. 'FULL_NODUP', means that all columns are logged in before image, but only changed columns or all columns of inserted record are logged in after image, 'NOBLOB', means that mysqld avoids logging blob columns whenever possible (eg, blob column was not changed or is not part of primary key). 'MINIMAL', means that a PK equivalent (PK columns or full row if there is no PK in the table) is logged in the before image, and only changed columns are logged in the after image. (Default: FULL). NUMERIC_MIN_VALUE NULL NUMERIC_MAX_VALUE NULL NUMERIC_BLOCK_SIZE NULL -ENUM_VALUE_LIST MINIMAL,NOBLOB,FULL +ENUM_VALUE_LIST MINIMAL,NOBLOB,FULL,FULL_NODUP READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME BINLOG_ROW_METADATA @@ -472,6 +542,16 @@ NUMERIC_BLOCK_SIZE NULL ENUM_VALUE_LIST NO_LOG,MINIMAL,FULL READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED +VARIABLE_NAME BINLOG_SPACE_LIMIT +VARIABLE_SCOPE GLOBAL +VARIABLE_TYPE BIGINT UNSIGNED +VARIABLE_COMMENT Alias for max_binlog_total_size. Compatibility with Percona server. +NUMERIC_MIN_VALUE 0 +NUMERIC_MAX_VALUE 18446744073709551615 +NUMERIC_BLOCK_SIZE 1 +ENUM_VALUE_LIST NULL +READ_ONLY NO +COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME BINLOG_STMT_CACHE_SIZE VARIABLE_SCOPE GLOBAL VARIABLE_TYPE BIGINT UNSIGNED @@ -482,6 +562,16 @@ NUMERIC_BLOCK_SIZE 4096 ENUM_VALUE_LIST NULL READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED +VARIABLE_NAME BLOCK_ENCRYPTION_MODE +VARIABLE_SCOPE SESSION +VARIABLE_TYPE ENUM +VARIABLE_COMMENT Default block encryption mode for AES_ENCRYPT() and AES_DECRYPT() functions +NUMERIC_MIN_VALUE NULL +NUMERIC_MAX_VALUE NULL +NUMERIC_BLOCK_SIZE NULL +ENUM_VALUE_LIST aes-128-ecb,aes-192-ecb,aes-256-ecb,aes-128-cbc,aes-192-cbc,aes-256-cbc,aes-128-ctr,aes-192-ctr,aes-256-ctr +READ_ONLY NO +COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME BULK_INSERT_BUFFER_SIZE VARIABLE_SCOPE SESSION VARIABLE_TYPE BIGINT UNSIGNED @@ -512,6 +602,16 @@ NUMERIC_BLOCK_SIZE NULL ENUM_VALUE_LIST NULL READ_ONLY NO COMMAND_LINE_ARGUMENT NULL +VARIABLE_NAME CHARACTER_SET_COLLATIONS +VARIABLE_SCOPE SESSION +VARIABLE_TYPE VARCHAR +VARIABLE_COMMENT Overrides for character set default collations +NUMERIC_MIN_VALUE NULL +NUMERIC_MAX_VALUE NULL +NUMERIC_BLOCK_SIZE NULL +ENUM_VALUE_LIST NULL +READ_ONLY NO +COMMAND_LINE_ARGUMENT NULL VARIABLE_NAME CHARACTER_SET_CONNECTION VARIABLE_SCOPE SESSION VARIABLE_TYPE ENUM @@ -702,26 +802,6 @@ NUMERIC_BLOCK_SIZE NULL ENUM_VALUE_LIST NULL READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED -VARIABLE_NAME DATETIME_FORMAT -VARIABLE_SCOPE GLOBAL -VARIABLE_TYPE VARCHAR -VARIABLE_COMMENT The DATETIME format (ignored) -NUMERIC_MIN_VALUE NULL -NUMERIC_MAX_VALUE NULL -NUMERIC_BLOCK_SIZE NULL -ENUM_VALUE_LIST NULL -READ_ONLY YES -COMMAND_LINE_ARGUMENT REQUIRED -VARIABLE_NAME DATE_FORMAT -VARIABLE_SCOPE GLOBAL -VARIABLE_TYPE VARCHAR -VARIABLE_COMMENT The DATE format (ignored) -NUMERIC_MIN_VALUE NULL -NUMERIC_MAX_VALUE NULL -NUMERIC_BLOCK_SIZE NULL -ENUM_VALUE_LIST NULL -READ_ONLY YES -COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME DEADLOCK_SEARCH_DEPTH_LONG VARIABLE_SCOPE SESSION VARIABLE_TYPE BIGINT UNSIGNED @@ -1825,7 +1905,7 @@ COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME LOG_SLOW_ADMIN_STATEMENTS VARIABLE_SCOPE SESSION VARIABLE_TYPE BOOLEAN -VARIABLE_COMMENT Log slow OPTIMIZE, ANALYZE, ALTER and other administrative statements to the slow log if it is open. Resets or sets the option 'admin' in log_slow_disabled_statements +VARIABLE_COMMENT Log slow OPTIMIZE, ANALYZE, ALTER and other administrative statements to the slow log if it is open. Resets or sets the option 'admin' in log_slow_filter. Deprecated, use log_slow_filter without 'admin'. NUMERIC_MIN_VALUE NULL NUMERIC_MAX_VALUE NULL NUMERIC_BLOCK_SIZE NULL @@ -2032,6 +2112,16 @@ NUMERIC_BLOCK_SIZE 4096 ENUM_VALUE_LIST NULL READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED +VARIABLE_NAME MAX_BINLOG_TOTAL_SIZE +VARIABLE_SCOPE GLOBAL +VARIABLE_TYPE BIGINT UNSIGNED +VARIABLE_COMMENT Maximum space to use for all binary logs. Extra logs are deleted on server start, log rotation, FLUSH LOGS or when writing to binlog. Default is 0, which means no size restrictions. See also slave_connections_needed_for_purge +NUMERIC_MIN_VALUE 0 +NUMERIC_MAX_VALUE 18446744073709551615 +NUMERIC_BLOCK_SIZE 1 +ENUM_VALUE_LIST NULL +READ_ONLY NO +COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME MAX_CONNECTIONS VARIABLE_SCOPE GLOBAL VARIABLE_TYPE BIGINT UNSIGNED @@ -2222,16 +2312,6 @@ NUMERIC_BLOCK_SIZE NULL ENUM_VALUE_LIST NULL READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED -VARIABLE_NAME MAX_TMP_TABLES -VARIABLE_SCOPE SESSION -VARIABLE_TYPE BIGINT UNSIGNED -VARIABLE_COMMENT Unused, will be removed. -NUMERIC_MIN_VALUE 1 -NUMERIC_MAX_VALUE 4294967295 -NUMERIC_BLOCK_SIZE 1 -ENUM_VALUE_LIST NULL -READ_ONLY NO -COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME MAX_USER_CONNECTIONS VARIABLE_SCOPE SESSION VARIABLE_TYPE INT @@ -2452,16 +2532,6 @@ NUMERIC_BLOCK_SIZE NULL ENUM_VALUE_LIST OFF,ON READ_ONLY NO COMMAND_LINE_ARGUMENT OPTIONAL -VARIABLE_NAME OLD_ALTER_TABLE -VARIABLE_SCOPE SESSION -VARIABLE_TYPE ENUM -VARIABLE_COMMENT Alias for alter_algorithm. Deprecated. Use --alter-algorithm instead. -NUMERIC_MIN_VALUE NULL -NUMERIC_MAX_VALUE NULL -NUMERIC_BLOCK_SIZE NULL -ENUM_VALUE_LIST DEFAULT,COPY,INPLACE,NOCOPY,INSTANT -READ_ONLY NO -COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME OLD_MODE VARIABLE_SCOPE SESSION VARIABLE_TYPE SET @@ -2469,7 +2539,7 @@ VARIABLE_COMMENT Used to emulate old behavior from earlier MariaDB or MySQL vers NUMERIC_MIN_VALUE NULL NUMERIC_MAX_VALUE NULL NUMERIC_BLOCK_SIZE NULL -ENUM_VALUE_LIST NO_DUP_KEY_WARNINGS_WITH_IGNORE,NO_PROGRESS_INFO,ZERO_DATE_TIME_CAST,UTF8_IS_UTF8MB3,IGNORE_INDEX_ONLY_FOR_JOIN,COMPAT_5_1_CHECKSUM,NO_NULL_COLLATION_IDS +ENUM_VALUE_LIST NO_DUP_KEY_WARNINGS_WITH_IGNORE,NO_PROGRESS_INFO,ZERO_DATE_TIME_CAST,UTF8_IS_UTF8MB3,IGNORE_INDEX_ONLY_FOR_JOIN,COMPAT_5_1_CHECKSUM,NO_NULL_COLLATION_IDS,LOCK_ALTER_TABLE_COPY READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME OLD_PASSWORDS @@ -2494,12 +2564,32 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME OPTIMIZER_ADJUST_SECONDARY_KEY_COSTS VARIABLE_SCOPE SESSION -VARIABLE_TYPE SET -VARIABLE_COMMENT A bit field with the following values: adjust_secondary_key_cost = Update secondary key costs for ranges to be at least 5x of clustered primary key costs. disable_max_seek = Disable 'max_seek optimization' for secondary keys and slight adjustment of filter cost. disable_forced_index_in_group_by = Disable automatic forced index in GROUP BY. This variable will be deleted in MariaDB 11.0 as it is not needed with the new 11.0 optimizer. -NUMERIC_MIN_VALUE NULL -NUMERIC_MAX_VALUE NULL +VARIABLE_TYPE BIGINT UNSIGNED +VARIABLE_COMMENT Unused, will be removed. +NUMERIC_MIN_VALUE 0 +NUMERIC_MAX_VALUE 2 +NUMERIC_BLOCK_SIZE 1 +ENUM_VALUE_LIST NULL +READ_ONLY NO +COMMAND_LINE_ARGUMENT REQUIRED +VARIABLE_NAME OPTIMIZER_DISK_READ_COST +VARIABLE_SCOPE GLOBAL +VARIABLE_TYPE DOUBLE +VARIABLE_COMMENT Cost of reading a block of IO_SIZE (4096) from a disk (in usec). +NUMERIC_MIN_VALUE 0 +NUMERIC_MAX_VALUE 10000 NUMERIC_BLOCK_SIZE NULL -ENUM_VALUE_LIST adjust_secondary_key_cost,disable_max_seek,disable_forced_index_in_group_by +ENUM_VALUE_LIST NULL +READ_ONLY NO +COMMAND_LINE_ARGUMENT REQUIRED +VARIABLE_NAME OPTIMIZER_DISK_READ_RATIO +VARIABLE_SCOPE GLOBAL +VARIABLE_TYPE DOUBLE +VARIABLE_COMMENT Chance that we have to do a disk read to find a row or index entry from the engine cache (cache_misses/total_cache_requests). 0.0 means that everything is cached and 1.0 means that nothing is expected to be in the engine cache. +NUMERIC_MIN_VALUE 0 +NUMERIC_MAX_VALUE 1 +NUMERIC_BLOCK_SIZE NULL +ENUM_VALUE_LIST NULL READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME OPTIMIZER_EXTRA_PRUNING_DEPTH @@ -2512,6 +2602,56 @@ NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED +VARIABLE_NAME OPTIMIZER_INDEX_BLOCK_COPY_COST +VARIABLE_SCOPE GLOBAL +VARIABLE_TYPE DOUBLE +VARIABLE_COMMENT Cost of copying a key block from the cache to intern storage as part of an index scan. +NUMERIC_MIN_VALUE 0 +NUMERIC_MAX_VALUE 1000 +NUMERIC_BLOCK_SIZE NULL +ENUM_VALUE_LIST NULL +READ_ONLY NO +COMMAND_LINE_ARGUMENT REQUIRED +VARIABLE_NAME OPTIMIZER_KEY_COMPARE_COST +VARIABLE_SCOPE GLOBAL +VARIABLE_TYPE DOUBLE +VARIABLE_COMMENT Cost of checking a key against the end key condition. +NUMERIC_MIN_VALUE 0 +NUMERIC_MAX_VALUE 1000 +NUMERIC_BLOCK_SIZE NULL +ENUM_VALUE_LIST NULL +READ_ONLY NO +COMMAND_LINE_ARGUMENT REQUIRED +VARIABLE_NAME OPTIMIZER_KEY_COPY_COST +VARIABLE_SCOPE GLOBAL +VARIABLE_TYPE DOUBLE +VARIABLE_COMMENT Cost of finding the next key in the engine and copying it to the SQL layer. +NUMERIC_MIN_VALUE 0 +NUMERIC_MAX_VALUE 1000 +NUMERIC_BLOCK_SIZE NULL +ENUM_VALUE_LIST NULL +READ_ONLY NO +COMMAND_LINE_ARGUMENT REQUIRED +VARIABLE_NAME OPTIMIZER_KEY_LOOKUP_COST +VARIABLE_SCOPE GLOBAL +VARIABLE_TYPE DOUBLE +VARIABLE_COMMENT Cost for finding a key based on a key value +NUMERIC_MIN_VALUE 0 +NUMERIC_MAX_VALUE 1000 +NUMERIC_BLOCK_SIZE NULL +ENUM_VALUE_LIST NULL +READ_ONLY NO +COMMAND_LINE_ARGUMENT REQUIRED +VARIABLE_NAME OPTIMIZER_KEY_NEXT_FIND_COST +VARIABLE_SCOPE GLOBAL +VARIABLE_TYPE DOUBLE +VARIABLE_COMMENT Cost of finding the next key and rowid when using filters. +NUMERIC_MIN_VALUE 0 +NUMERIC_MAX_VALUE 1000 +NUMERIC_BLOCK_SIZE NULL +ENUM_VALUE_LIST NULL +READ_ONLY NO +COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME OPTIMIZER_MAX_SEL_ARGS VARIABLE_SCOPE SESSION VARIABLE_TYPE BIGINT UNSIGNED @@ -2542,6 +2682,66 @@ NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED +VARIABLE_NAME OPTIMIZER_ROWID_COMPARE_COST +VARIABLE_SCOPE GLOBAL +VARIABLE_TYPE DOUBLE +VARIABLE_COMMENT Cost of comparing two rowid's +NUMERIC_MIN_VALUE 0 +NUMERIC_MAX_VALUE 1000 +NUMERIC_BLOCK_SIZE NULL +ENUM_VALUE_LIST NULL +READ_ONLY NO +COMMAND_LINE_ARGUMENT REQUIRED +VARIABLE_NAME OPTIMIZER_ROWID_COPY_COST +VARIABLE_SCOPE GLOBAL +VARIABLE_TYPE DOUBLE +VARIABLE_COMMENT Cost of copying a rowid +NUMERIC_MIN_VALUE 0 +NUMERIC_MAX_VALUE 1000 +NUMERIC_BLOCK_SIZE NULL +ENUM_VALUE_LIST NULL +READ_ONLY NO +COMMAND_LINE_ARGUMENT REQUIRED +VARIABLE_NAME OPTIMIZER_ROW_COPY_COST +VARIABLE_SCOPE GLOBAL +VARIABLE_TYPE DOUBLE +VARIABLE_COMMENT Cost of copying a row from the engine or the join cache to the SQL layer. +NUMERIC_MIN_VALUE 0 +NUMERIC_MAX_VALUE 1000 +NUMERIC_BLOCK_SIZE NULL +ENUM_VALUE_LIST NULL +READ_ONLY NO +COMMAND_LINE_ARGUMENT REQUIRED +VARIABLE_NAME OPTIMIZER_ROW_LOOKUP_COST +VARIABLE_SCOPE GLOBAL +VARIABLE_TYPE DOUBLE +VARIABLE_COMMENT Cost of finding a row based on a rowid or a clustered key. +NUMERIC_MIN_VALUE 0 +NUMERIC_MAX_VALUE 1000 +NUMERIC_BLOCK_SIZE NULL +ENUM_VALUE_LIST NULL +READ_ONLY NO +COMMAND_LINE_ARGUMENT REQUIRED +VARIABLE_NAME OPTIMIZER_ROW_NEXT_FIND_COST +VARIABLE_SCOPE GLOBAL +VARIABLE_TYPE DOUBLE +VARIABLE_COMMENT Cost of finding the next row when scanning the table. +NUMERIC_MIN_VALUE 0 +NUMERIC_MAX_VALUE 1000 +NUMERIC_BLOCK_SIZE NULL +ENUM_VALUE_LIST NULL +READ_ONLY NO +COMMAND_LINE_ARGUMENT REQUIRED +VARIABLE_NAME OPTIMIZER_SCAN_SETUP_COST +VARIABLE_SCOPE SESSION +VARIABLE_TYPE DOUBLE +VARIABLE_COMMENT Extra cost added to TABLE and INDEX scans to get optimizer to prefer index lookups. +NUMERIC_MIN_VALUE 0 +NUMERIC_MAX_VALUE 100000000 +NUMERIC_BLOCK_SIZE NULL +ENUM_VALUE_LIST NULL +READ_ONLY NO +COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME OPTIMIZER_SEARCH_DEPTH VARIABLE_SCOPE SESSION VARIABLE_TYPE BIGINT UNSIGNED @@ -2569,7 +2769,7 @@ VARIABLE_COMMENT Fine-tune the optimizer behavior NUMERIC_MIN_VALUE NULL NUMERIC_MAX_VALUE NULL NUMERIC_BLOCK_SIZE NULL -ENUM_VALUE_LIST index_merge,index_merge_union,index_merge_sort_union,index_merge_intersection,index_merge_sort_intersection,engine_condition_pushdown,index_condition_pushdown,derived_merge,derived_with_keys,firstmatch,loosescan,materialization,in_to_exists,semijoin,partial_match_rowid_merge,partial_match_table_scan,subquery_cache,mrr,mrr_cost_based,mrr_sort_keys,outer_join_with_cache,semijoin_with_cache,join_cache_incremental,join_cache_hashed,join_cache_bka,optimize_join_buffer_size,table_elimination,extended_keys,exists_to_in,orderby_uses_equalities,condition_pushdown_for_derived,split_materialized,condition_pushdown_for_subquery,rowid_filter,condition_pushdown_from_having,not_null_range_scan,hash_join_cardinality,cset_narrowing,default +ENUM_VALUE_LIST index_merge,index_merge_union,index_merge_sort_union,index_merge_intersection,index_merge_sort_intersection,index_condition_pushdown,derived_merge,derived_with_keys,firstmatch,loosescan,materialization,in_to_exists,semijoin,partial_match_rowid_merge,partial_match_table_scan,subquery_cache,mrr,mrr_cost_based,mrr_sort_keys,outer_join_with_cache,semijoin_with_cache,join_cache_incremental,join_cache_hashed,join_cache_bka,optimize_join_buffer_size,table_elimination,extended_keys,exists_to_in,orderby_uses_equalities,condition_pushdown_for_derived,split_materialized,condition_pushdown_for_subquery,rowid_filter,condition_pushdown_from_having,not_null_range_scan,hash_join_cardinality,cset_narrowing,sargable_casefold,default READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME OPTIMIZER_TRACE @@ -2602,6 +2802,16 @@ NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED +VARIABLE_NAME OPTIMIZER_WHERE_COST +VARIABLE_SCOPE SESSION +VARIABLE_TYPE DOUBLE +VARIABLE_COMMENT Cost of checking the row against the WHERE clause. Increasing this will have the optimizer to prefer plans with less row combinations. +NUMERIC_MIN_VALUE 0 +NUMERIC_MAX_VALUE 100000 +NUMERIC_BLOCK_SIZE NULL +ENUM_VALUE_LIST NULL +READ_ONLY NO +COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA VARIABLE_SCOPE GLOBAL VARIABLE_TYPE BOOLEAN @@ -3302,6 +3512,16 @@ NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED +VARIABLE_NAME REDIRECT_URL +VARIABLE_SCOPE SESSION +VARIABLE_TYPE VARCHAR +VARIABLE_COMMENT URL of another server to redirect clients to. Empty string means no redirection +NUMERIC_MIN_VALUE NULL +NUMERIC_MAX_VALUE NULL +NUMERIC_BLOCK_SIZE NULL +ENUM_VALUE_LIST NULL +READ_ONLY NO +COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME RELAY_LOG VARIABLE_SCOPE GLOBAL VARIABLE_TYPE VARCHAR @@ -3772,6 +3992,16 @@ NUMERIC_BLOCK_SIZE NULL ENUM_VALUE_LIST OFF,ON READ_ONLY NO COMMAND_LINE_ARGUMENT OPTIONAL +VARIABLE_NAME SLAVE_CONNECTIONS_NEEDED_FOR_PURGE +VARIABLE_SCOPE GLOBAL +VARIABLE_TYPE INT UNSIGNED +VARIABLE_COMMENT Minimum number of connected slaves required for automatic binary log purge with max_binlog_total_size, binlog_expire_logs_seconds or binlog_expire_logs_days. +NUMERIC_MIN_VALUE 0 +NUMERIC_MAX_VALUE 4294967295 +NUMERIC_BLOCK_SIZE 1 +ENUM_VALUE_LIST NULL +READ_ONLY NO +COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME SLAVE_DDL_EXEC_MODE VARIABLE_SCOPE GLOBAL VARIABLE_TYPE ENUM @@ -4532,16 +4762,6 @@ NUMERIC_BLOCK_SIZE NULL ENUM_VALUE_LIST NULL READ_ONLY NO COMMAND_LINE_ARGUMENT NULL -VARIABLE_NAME TIME_FORMAT -VARIABLE_SCOPE GLOBAL -VARIABLE_TYPE VARCHAR -VARIABLE_COMMENT The TIME format (ignored) -NUMERIC_MIN_VALUE NULL -NUMERIC_MAX_VALUE NULL -NUMERIC_BLOCK_SIZE NULL -ENUM_VALUE_LIST NULL -READ_ONLY YES -COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME TIME_ZONE VARIABLE_SCOPE SESSION VARIABLE_TYPE VARCHAR @@ -4612,6 +4832,16 @@ NUMERIC_BLOCK_SIZE 1024 ENUM_VALUE_LIST NULL READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED +VARIABLE_NAME TRANSACTION_ISOLATION +VARIABLE_SCOPE SESSION +VARIABLE_TYPE ENUM +VARIABLE_COMMENT Default transaction isolation level +NUMERIC_MIN_VALUE NULL +NUMERIC_MAX_VALUE NULL +NUMERIC_BLOCK_SIZE NULL +ENUM_VALUE_LIST READ-UNCOMMITTED,READ-COMMITTED,REPEATABLE-READ,SERIALIZABLE +READ_ONLY NO +COMMAND_LINE_ARGUMENT NULL VARIABLE_NAME TRANSACTION_PREALLOC_SIZE VARIABLE_SCOPE SESSION VARIABLE_TYPE BIGINT UNSIGNED @@ -4622,10 +4852,20 @@ NUMERIC_BLOCK_SIZE 1024 ENUM_VALUE_LIST NULL READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED +VARIABLE_NAME TRANSACTION_READ_ONLY +VARIABLE_SCOPE SESSION +VARIABLE_TYPE BOOLEAN +VARIABLE_COMMENT Default transaction access mode. If set to OFF, the default, access is read/write. If set to ON, access is read-only. The SET TRANSACTION statement can also change the value of this variable. See SET TRANSACTION and START TRANSACTION. +NUMERIC_MIN_VALUE NULL +NUMERIC_MAX_VALUE NULL +NUMERIC_BLOCK_SIZE NULL +ENUM_VALUE_LIST OFF,ON +READ_ONLY NO +COMMAND_LINE_ARGUMENT NULL VARIABLE_NAME TX_ISOLATION VARIABLE_SCOPE SESSION VARIABLE_TYPE ENUM -VARIABLE_COMMENT Default transaction isolation level +VARIABLE_COMMENT Default transaction isolation level.This variable is deprecated and will be removed in a future release. NUMERIC_MIN_VALUE NULL NUMERIC_MAX_VALUE NULL NUMERIC_BLOCK_SIZE NULL @@ -4635,7 +4875,7 @@ COMMAND_LINE_ARGUMENT NULL VARIABLE_NAME TX_READ_ONLY VARIABLE_SCOPE SESSION VARIABLE_TYPE BOOLEAN -VARIABLE_COMMENT Default transaction access mode. If set to OFF, the default, access is read/write. If set to ON, access is read-only. The SET TRANSACTION statement can also change the value of this variable. See SET TRANSACTION and START TRANSACTION. +VARIABLE_COMMENT Default transaction access mode. If set to OFF, the default, access is read/write. If set to ON, access is read-only. The SET TRANSACTION statement can also change the value of this variable. See SET TRANSACTION and START TRANSACTION.This variable is deprecated and will be removed in a future release. NUMERIC_MIN_VALUE NULL NUMERIC_MAX_VALUE NULL NUMERIC_BLOCK_SIZE NULL diff --git a/mysql-test/suite/sys_vars/r/sysvars_wsrep,32bit.rdiff b/mysql-test/suite/sys_vars/r/sysvars_wsrep,32bit.rdiff index 016bd016..94292859 100644 --- a/mysql-test/suite/sys_vars/r/sysvars_wsrep,32bit.rdiff +++ b/mysql-test/suite/sys_vars/r/sysvars_wsrep,32bit.rdiff @@ -1,24 +1,24 @@ ---- suite/sys_vars/r/sysvars_wsrep.result 2014-10-10 13:33:55.000000000 +0300 -+++ suite/sys_vars/r/sysvars_wsrep,32bit.reject 2014-10-10 19:38:09.000000000 +0300 -@@ -245,7 +245,7 @@ +--- a/mysql-test/suite/sys_vars/r/sysvars_wsrep.result ++++ b/mysql-test/suite/sys_vars/r/sysvars_wsrep.result +@@ -307,7 +307,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME - DEFAULT_VALUE 131072 + DEFAULT_VALUE 0 VARIABLE_SCOPE GLOBAL -VARIABLE_TYPE BIGINT UNSIGNED +VARIABLE_TYPE INT UNSIGNED VARIABLE_COMMENT Max number of rows in write set - NUMERIC_MIN_VALUE 1 + NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 1048576 -@@ -259,7 +259,7 @@ +@@ -322,7 +322,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME - DEFAULT_VALUE 1073741824 + DEFAULT_VALUE 2147483647 VARIABLE_SCOPE GLOBAL -VARIABLE_TYPE BIGINT UNSIGNED +VARIABLE_TYPE INT UNSIGNED VARIABLE_COMMENT Max write set size (bytes) NUMERIC_MIN_VALUE 1024 - NUMERIC_MAX_VALUE 4294901759 -@@ -273,7 +273,7 @@ + NUMERIC_MAX_VALUE 2147483647 +@@ -352,7 +352,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 0 VARIABLE_SCOPE GLOBAL @@ -27,7 +27,7 @@ VARIABLE_COMMENT mysql replication group commit NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 1000 -@@ -455,7 +455,7 @@ +@@ -547,7 +547,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 1 VARIABLE_SCOPE SESSION @@ -36,7 +36,7 @@ VARIABLE_COMMENT Max number of times to retry a failed autocommit statement NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 10000 -@@ -483,7 +483,7 @@ +@@ -577,7 +577,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 1 VARIABLE_SCOPE GLOBAL diff --git a/mysql-test/suite/sys_vars/r/sysvars_wsrep.result b/mysql-test/suite/sys_vars/r/sysvars_wsrep.result index 4ca95338..cbea1d71 100644 --- a/mysql-test/suite/sys_vars/r/sysvars_wsrep.result +++ b/mysql-test/suite/sys_vars/r/sysvars_wsrep.result @@ -31,21 +31,6 @@ ENUM_VALUE_LIST OFF,ON READ_ONLY NO COMMAND_LINE_ARGUMENT OPTIONAL GLOBAL_VALUE_PATH NULL -VARIABLE_NAME WSREP_CAUSAL_READS -SESSION_VALUE OFF -GLOBAL_VALUE OFF -GLOBAL_VALUE_ORIGIN COMPILE-TIME -DEFAULT_VALUE OFF -VARIABLE_SCOPE SESSION -VARIABLE_TYPE BOOLEAN -VARIABLE_COMMENT Setting this variable is equivalent to setting wsrep_sync_wait READ flag -NUMERIC_MIN_VALUE NULL -NUMERIC_MAX_VALUE NULL -NUMERIC_BLOCK_SIZE NULL -ENUM_VALUE_LIST OFF,ON -READ_ONLY NO -COMMAND_LINE_ARGUMENT OPTIONAL -GLOBAL_VALUE_PATH NULL VARIABLE_NAME WSREP_CERTIFICATION_RULES SESSION_VALUE NULL GLOBAL_VALUE strict diff --git a/mysql-test/suite/sys_vars/r/thread_pool_idle_timeout_grant.result b/mysql-test/suite/sys_vars/r/thread_pool_idle_timeout_grant.result index f9e14eaf..a9f3021d 100644 --- a/mysql-test/suite/sys_vars/r/thread_pool_idle_timeout_grant.result +++ b/mysql-test/suite/sys_vars/r/thread_pool_idle_timeout_grant.result @@ -2,14 +2,14 @@ SET @global=@@global.thread_pool_idle_timeout; # # MDEV-21961 Bind CONNECTION ADMIN to a number of global system variables # -# Test that "SET thread_pool_idle_timeout" is not allowed without CONNECTION ADMIN or SUPER +# Test that "SET thread_pool_idle_timeout" is not allowed without CONNECTION ADMIN CREATE USER user1@localhost; GRANT ALL PRIVILEGES ON *.* TO user1@localhost; -REVOKE CONNECTION ADMIN, SUPER ON *.* FROM user1@localhost; +REVOKE CONNECTION ADMIN ON *.* FROM user1@localhost; connect user1,localhost,user1,,; connection user1; SET GLOBAL thread_pool_idle_timeout=10; -ERROR 42000: Access denied; you need (at least one of) the SUPER, CONNECTION ADMIN privilege(s) for this operation +ERROR 42000: Access denied; you need (at least one of) the CONNECTION ADMIN privilege(s) for this operation SET thread_pool_idle_timeout=10; ERROR HY000: Variable 'thread_pool_idle_timeout' is a GLOBAL variable and should be set with SET GLOBAL SET SESSION thread_pool_idle_timeout=10; @@ -30,17 +30,4 @@ ERROR HY000: Variable 'thread_pool_idle_timeout' is a GLOBAL variable and should disconnect user1; connection default; DROP USER user1@localhost; -# Test that "SET thread_pool_idle_timeout" is allowed with SUPER -CREATE USER user1@localhost; -GRANT SUPER ON *.* TO user1@localhost; -connect user1,localhost,user1,,; -connection user1; -SET GLOBAL thread_pool_idle_timeout=10; -SET thread_pool_idle_timeout=10; -ERROR HY000: Variable 'thread_pool_idle_timeout' is a GLOBAL variable and should be set with SET GLOBAL -SET SESSION thread_pool_idle_timeout=10; -ERROR HY000: Variable 'thread_pool_idle_timeout' is a GLOBAL variable and should be set with SET GLOBAL -disconnect user1; -connection default; -DROP USER user1@localhost; SET @@global.thread_pool_idle_timeout=@global; diff --git a/mysql-test/suite/sys_vars/r/thread_pool_max_threads_grant.result b/mysql-test/suite/sys_vars/r/thread_pool_max_threads_grant.result index 17511766..40ea57a7 100644 --- a/mysql-test/suite/sys_vars/r/thread_pool_max_threads_grant.result +++ b/mysql-test/suite/sys_vars/r/thread_pool_max_threads_grant.result @@ -2,14 +2,14 @@ SET @global=@@global.thread_pool_max_threads; # # MDEV-21961 Bind CONNECTION ADMIN to a number of global system variables # -# Test that "SET thread_pool_max_threads" is not allowed without CONNECTION ADMIN or SUPER +# Test that "SET thread_pool_max_threads" is not allowed without CONNECTION ADMIN CREATE USER user1@localhost; GRANT ALL PRIVILEGES ON *.* TO user1@localhost; -REVOKE CONNECTION ADMIN, SUPER ON *.* FROM user1@localhost; +REVOKE CONNECTION ADMIN ON *.* FROM user1@localhost; connect user1,localhost,user1,,; connection user1; SET GLOBAL thread_pool_max_threads=10; -ERROR 42000: Access denied; you need (at least one of) the SUPER, CONNECTION ADMIN privilege(s) for this operation +ERROR 42000: Access denied; you need (at least one of) the CONNECTION ADMIN privilege(s) for this operation SET thread_pool_max_threads=10; ERROR HY000: Variable 'thread_pool_max_threads' is a GLOBAL variable and should be set with SET GLOBAL SET SESSION thread_pool_max_threads=10; @@ -30,17 +30,4 @@ ERROR HY000: Variable 'thread_pool_max_threads' is a GLOBAL variable and should disconnect user1; connection default; DROP USER user1@localhost; -# Test that "SET thread_pool_max_threads" is allowed with SUPER -CREATE USER user1@localhost; -GRANT SUPER ON *.* TO user1@localhost; -connect user1,localhost,user1,,; -connection user1; -SET GLOBAL thread_pool_max_threads=10; -SET thread_pool_max_threads=10; -ERROR HY000: Variable 'thread_pool_max_threads' is a GLOBAL variable and should be set with SET GLOBAL -SET SESSION thread_pool_max_threads=10; -ERROR HY000: Variable 'thread_pool_max_threads' is a GLOBAL variable and should be set with SET GLOBAL -disconnect user1; -connection default; -DROP USER user1@localhost; SET @@global.thread_pool_max_threads=@global; diff --git a/mysql-test/suite/sys_vars/r/thread_pool_oversubscribe_grant.result b/mysql-test/suite/sys_vars/r/thread_pool_oversubscribe_grant.result index 965be157..ddb5cc01 100644 --- a/mysql-test/suite/sys_vars/r/thread_pool_oversubscribe_grant.result +++ b/mysql-test/suite/sys_vars/r/thread_pool_oversubscribe_grant.result @@ -2,14 +2,14 @@ SET @global=@@global.thread_pool_oversubscribe; # # MDEV-21961 Bind CONNECTION ADMIN to a number of global system variables # -# Test that "SET thread_pool_oversubscribe" is not allowed without CONNECTION ADMIN or SUPER +# Test that "SET thread_pool_oversubscribe" is not allowed without CONNECTION ADMIN CREATE USER user1@localhost; GRANT ALL PRIVILEGES ON *.* TO user1@localhost; -REVOKE CONNECTION ADMIN, SUPER ON *.* FROM user1@localhost; +REVOKE CONNECTION ADMIN ON *.* FROM user1@localhost; connect user1,localhost,user1,,; connection user1; SET GLOBAL thread_pool_oversubscribe=10; -ERROR 42000: Access denied; you need (at least one of) the SUPER, CONNECTION ADMIN privilege(s) for this operation +ERROR 42000: Access denied; you need (at least one of) the CONNECTION ADMIN privilege(s) for this operation SET thread_pool_oversubscribe=10; ERROR HY000: Variable 'thread_pool_oversubscribe' is a GLOBAL variable and should be set with SET GLOBAL SET SESSION thread_pool_oversubscribe=10; @@ -30,17 +30,4 @@ ERROR HY000: Variable 'thread_pool_oversubscribe' is a GLOBAL variable and shoul disconnect user1; connection default; DROP USER user1@localhost; -# Test that "SET thread_pool_oversubscribe" is allowed with SUPER -CREATE USER user1@localhost; -GRANT SUPER ON *.* TO user1@localhost; -connect user1,localhost,user1,,; -connection user1; -SET GLOBAL thread_pool_oversubscribe=10; -SET thread_pool_oversubscribe=10; -ERROR HY000: Variable 'thread_pool_oversubscribe' is a GLOBAL variable and should be set with SET GLOBAL -SET SESSION thread_pool_oversubscribe=10; -ERROR HY000: Variable 'thread_pool_oversubscribe' is a GLOBAL variable and should be set with SET GLOBAL -disconnect user1; -connection default; -DROP USER user1@localhost; SET @@global.thread_pool_oversubscribe=@global; diff --git a/mysql-test/suite/sys_vars/r/thread_pool_stall_limit_grant.result b/mysql-test/suite/sys_vars/r/thread_pool_stall_limit_grant.result index 08462dc4..335f60ea 100644 --- a/mysql-test/suite/sys_vars/r/thread_pool_stall_limit_grant.result +++ b/mysql-test/suite/sys_vars/r/thread_pool_stall_limit_grant.result @@ -2,14 +2,14 @@ SET @global=@@global.thread_pool_stall_limit; # # MDEV-21961 Bind CONNECTION ADMIN to a number of global system variables # -# Test that "SET thread_pool_stall_limit" is not allowed without CONNECTION ADMIN or SUPER +# Test that "SET thread_pool_stall_limit" is not allowed without CONNECTION ADMIN CREATE USER user1@localhost; GRANT ALL PRIVILEGES ON *.* TO user1@localhost; -REVOKE CONNECTION ADMIN, SUPER ON *.* FROM user1@localhost; +REVOKE CONNECTION ADMIN ON *.* FROM user1@localhost; connect user1,localhost,user1,,; connection user1; SET GLOBAL thread_pool_stall_limit=400; -ERROR 42000: Access denied; you need (at least one of) the SUPER, CONNECTION ADMIN privilege(s) for this operation +ERROR 42000: Access denied; you need (at least one of) the CONNECTION ADMIN privilege(s) for this operation SET thread_pool_stall_limit=400; ERROR HY000: Variable 'thread_pool_stall_limit' is a GLOBAL variable and should be set with SET GLOBAL SET SESSION thread_pool_stall_limit=400; @@ -30,17 +30,4 @@ ERROR HY000: Variable 'thread_pool_stall_limit' is a GLOBAL variable and should disconnect user1; connection default; DROP USER user1@localhost; -# Test that "SET thread_pool_stall_limit" is allowed with SUPER -CREATE USER user1@localhost; -GRANT SUPER ON *.* TO user1@localhost; -connect user1,localhost,user1,,; -connection user1; -SET GLOBAL thread_pool_stall_limit=400; -SET thread_pool_stall_limit=400; -ERROR HY000: Variable 'thread_pool_stall_limit' is a GLOBAL variable and should be set with SET GLOBAL -SET SESSION thread_pool_stall_limit=400; -ERROR HY000: Variable 'thread_pool_stall_limit' is a GLOBAL variable and should be set with SET GLOBAL -disconnect user1; -connection default; -DROP USER user1@localhost; SET @@global.thread_pool_stall_limit=@global; diff --git a/mysql-test/suite/sys_vars/r/time_format_basic.result b/mysql-test/suite/sys_vars/r/time_format_basic.result deleted file mode 100644 index fcc23608..00000000 --- a/mysql-test/suite/sys_vars/r/time_format_basic.result +++ /dev/null @@ -1,21 +0,0 @@ -select @@global.time_format; -@@global.time_format -%H:%i:%s -select @@session.time_format; -ERROR HY000: Variable 'time_format' is a GLOBAL variable -show global variables like 'time_format'; -Variable_name Value -time_format %H:%i:%s -show session variables like 'time_format'; -Variable_name Value -time_format %H:%i:%s -select * from information_schema.global_variables where variable_name='time_format'; -VARIABLE_NAME VARIABLE_VALUE -TIME_FORMAT %H:%i:%s -select * from information_schema.session_variables where variable_name='time_format'; -VARIABLE_NAME VARIABLE_VALUE -TIME_FORMAT %H:%i:%s -set global time_format=1; -ERROR HY000: Variable 'time_format' is a read only variable -set session time_format=1; -ERROR HY000: Variable 'time_format' is a read only variable diff --git a/mysql-test/suite/sys_vars/r/transaction_isolation_basic.result b/mysql-test/suite/sys_vars/r/transaction_isolation_basic.result new file mode 100644 index 00000000..ef5d6007 --- /dev/null +++ b/mysql-test/suite/sys_vars/r/transaction_isolation_basic.result @@ -0,0 +1,141 @@ +SET @global_start_value = @@global.transaction_isolation; +SELECT @global_start_value; +@global_start_value +REPEATABLE-READ +SET @session_start_value = @@session.transaction_isolation; +SELECT @session_start_value; +@session_start_value +REPEATABLE-READ +'#--------------------FN_DYNVARS_183_01------------------------#' +SET @@global.transaction_isolation = 'READ-UNCOMMITTED'; +SET @@global.transaction_isolation = DEFAULT; +SELECT @@global.transaction_isolation; +@@global.transaction_isolation +REPEATABLE-READ +SET @@session.transaction_isolation = DEFAULT; +SELECT @@session.transaction_isolation; +@@session.transaction_isolation +REPEATABLE-READ +'#---------------------FN_DYNVARS_183_02-------------------------#' +SET @@global.transaction_isolation = NULL; +ERROR 42000: Variable 'transaction_isolation' can't be set to the value of 'NULL' +SET @@global.transaction_isolation = ''; +ERROR 42000: Variable 'transaction_isolation' can't be set to the value of '' +SET @@session.transaction_isolation = NULL; +ERROR 42000: Variable 'transaction_isolation' can't be set to the value of 'NULL' +SET @@session.transaction_isolation = ''; +ERROR 42000: Variable 'transaction_isolation' can't be set to the value of '' +'#--------------------FN_DYNVARS_183_03------------------------#' +SET @@global.transaction_isolation = 'READ-UNCOMMITTED'; +SELECT @@global.transaction_isolation; +@@global.transaction_isolation +READ-UNCOMMITTED +SET @@global.transaction_isolation = 'read-COMMITTED'; +SELECT @@global.transaction_isolation; +@@global.transaction_isolation +READ-COMMITTED +SET @@global.transaction_isolation = 'REPEATABLE-READ'; +SELECT @@global.transaction_isolation; +@@global.transaction_isolation +REPEATABLE-READ +SET @@global.transaction_isolation = 'SERIALIZable'; +SELECT @@global.transaction_isolation; +@@global.transaction_isolation +SERIALIZABLE +SET @@session.transaction_isolation = 'READ-UNCOMMITTED'; +SELECT @@session.transaction_isolation; +@@session.transaction_isolation +READ-UNCOMMITTED +SET @@session.transaction_isolation = 'READ-COMMITTED'; +SELECT @@session.transaction_isolation; +@@session.transaction_isolation +READ-COMMITTED +SET @@session.transaction_isolation = 'REPEATABLE-READ'; +SELECT @@session.transaction_isolation; +@@session.transaction_isolation +REPEATABLE-READ +SET @@session.transaction_isolation = 'serializable'; +SELECT @@session.transaction_isolation; +@@session.transaction_isolation +SERIALIZABLE +'#--------------------FN_DYNVARS_183_04-------------------------#' +SET @@global.transaction_isolation = -1; +ERROR 42000: Variable 'transaction_isolation' can't be set to the value of '-1' +SET @@global.transaction_isolation = READUNCOMMITTED; +ERROR 42000: Variable 'transaction_isolation' can't be set to the value of 'READUNCOMMITTED' +SET @@global.transaction_isolation = 'REPEATABLE'; +ERROR 42000: Variable 'transaction_isolation' can't be set to the value of 'REPEATABLE' +SET @@global.transaction_isolation = OFF; +ERROR 42000: Variable 'transaction_isolation' can't be set to the value of 'OFF' +SET @@global.transaction_isolation = ON; +ERROR 42000: Variable 'transaction_isolation' can't be set to the value of 'ON' +SET @@global.transaction_isolation = 'NON-SERIALIZABLE'; +ERROR 42000: Variable 'transaction_isolation' can't be set to the value of 'NON-SERIALIZABLE' +SET @@transaction_isolation = -1; +ERROR 42000: Variable 'transaction_isolation' can't be set to the value of '-1' +SET @@transaction_isolation = READUNCOMMITTED; +ERROR 42000: Variable 'transaction_isolation' can't be set to the value of 'READUNCOMMITTED' +SET @@transaction_isolation = 'REPEATABLE'; +ERROR 42000: Variable 'transaction_isolation' can't be set to the value of 'REPEATABLE' +SET @@transaction_isolation = 'NONE'; +ERROR 42000: Variable 'transaction_isolation' can't be set to the value of 'NONE' +SET @@transaction_isolation = 'ALL'; +ERROR 42000: Variable 'transaction_isolation' can't be set to the value of 'ALL' +'#-------------------FN_DYNVARS_183_05----------------------------#' +SELECT @@session.transaction_isolation = VARIABLE_VALUE +FROM INFORMATION_SCHEMA.SESSION_VARIABLES +WHERE VARIABLE_NAME='transaction_isolation'; +@@session.transaction_isolation = VARIABLE_VALUE +1 +'#----------------------FN_DYNVARS_183_06------------------------#' +SELECT @@global.transaction_isolation = VARIABLE_VALUE +FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES +WHERE VARIABLE_NAME='transaction_isolation'; +@@global.transaction_isolation = VARIABLE_VALUE +1 +'#---------------------FN_DYNVARS_183_07-------------------------#' +SET @@global.transaction_isolation = 0; +SELECT @@global.transaction_isolation; +@@global.transaction_isolation +READ-UNCOMMITTED +SET @@global.transaction_isolation = 1; +SELECT @@global.transaction_isolation; +@@global.transaction_isolation +READ-COMMITTED +SET @@global.transaction_isolation = 2; +SELECT @@global.transaction_isolation; +@@global.transaction_isolation +REPEATABLE-READ +SET @@global.transaction_isolation = 3; +SELECT @@global.transaction_isolation; +@@global.transaction_isolation +SERIALIZABLE +SET @@global.transaction_isolation = 0.4; +ERROR 42000: Incorrect argument type to variable 'transaction_isolation' +'#---------------------FN_DYNVARS_183_08----------------------#' +SET @@global.transaction_isolation = TRUE; +SELECT @@global.transaction_isolation; +@@global.transaction_isolation +READ-COMMITTED +SET @@global.transaction_isolation = FALSE; +SELECT @@global.transaction_isolation; +@@global.transaction_isolation +READ-UNCOMMITTED +'#---------------------FN_DYNVARS_183_09----------------------#' +SET transaction_isolation = 'REPEATABLE-READ'; +SET session transaction_isolation = 'REPEATABLE-READ'; +SELECT @@transaction_isolation; +@@transaction_isolation +REPEATABLE-READ +SET global transaction_isolation = 'REPEATABLE-READ'; +SELECT @@global.transaction_isolation; +@@global.transaction_isolation +REPEATABLE-READ +SET @@global.transaction_isolation = @global_start_value; +SELECT @@global.transaction_isolation; +@@global.transaction_isolation +REPEATABLE-READ +SET @@session.transaction_isolation = @session_start_value; +SELECT @@session.transaction_isolation; +@@session.transaction_isolation +REPEATABLE-READ diff --git a/mysql-test/suite/sys_vars/r/tx_isolation_func.result b/mysql-test/suite/sys_vars/r/transaction_isolation_func.result index 3f6bd0b4..b27050a0 100644 --- a/mysql-test/suite/sys_vars/r/tx_isolation_func.result +++ b/mysql-test/suite/sys_vars/r/transaction_isolation_func.result @@ -1,6 +1,6 @@ ** Setup ** -SET @session_tx_isolation = @@SESSION.tx_isolation; -SET @global_tx_isolation = @@GLOBAL.tx_isolation; +SET @session_transaction_isolation = @@SESSION.transaction_isolation; +SET @global_transaction_isolation = @@GLOBAL.transaction_isolation; connect con0,localhost,root,,; connection con0; SET SESSION AUTOCOMMIT = OFF; @@ -20,10 +20,10 @@ INSERT INTO t1 VALUES(22, 22); INSERT INTO t1 VALUES(24, 24); '#----------------------------FN_DYNVARS_184_01--------------------------------------#' connection con0; -SET SESSION tx_isolation = 'READ-UNCOMMITTED'; +SET SESSION transaction_isolation = 'READ-UNCOMMITTED'; set binlog_format=mixed; connection con1; -SET SESSION tx_isolation = 'READ-UNCOMMITTED'; +SET SESSION transaction_isolation = 'READ-UNCOMMITTED'; set binlog_format=mixed; connection con0; START TRANSACTION; @@ -114,9 +114,9 @@ connection con0; COMMIT; '#----------------------------FN_DYNVARS_184_03--------------------------------------#' connection con0; -SET SESSION tx_isolation = 'READ-COMMITTED'; +SET SESSION transaction_isolation = 'READ-COMMITTED'; connection con1; -SET SESSION tx_isolation = 'READ-COMMITTED'; +SET SESSION transaction_isolation = 'READ-COMMITTED'; connection con0; START TRANSACTION; SELECT * FROM t1 WHERE a % 2 = 0 FOR UPDATE; @@ -168,9 +168,9 @@ connection con0; COMMIT; '#----------------------------FN_DYNVARS_184_04--------------------------------------#' connection con0; -SET SESSION tx_isolation = 'REPEATABLE-READ'; +SET SESSION transaction_isolation = 'REPEATABLE-READ'; connection con1; -SET SESSION tx_isolation = 'REPEATABLE-READ'; +SET SESSION transaction_isolation = 'REPEATABLE-READ'; connection con0; START TRANSACTION; SELECT * FROM t1 WHERE a % 2 = 0 FOR UPDATE; @@ -332,9 +332,9 @@ connection con0; COMMIT; '#----------------------------FN_DYNVARS_184_07--------------------------------------#' connection con0; -SET SESSION tx_isolation = 'SERIALIZABLE'; +SET SESSION transaction_isolation = 'SERIALIZABLE'; connection con1; -SET SESSION tx_isolation = 'SERIALIZABLE'; +SET SESSION transaction_isolation = 'SERIALIZABLE'; connection con0; START TRANSACTION; SELECT * FROM t1 WHERE a % 2 = 0 FOR UPDATE; @@ -363,40 +363,40 @@ COMMIT; connection con0; COMMIT; '#----------------------------FN_DYNVARS_184_08--------------------------------------#' -SET GLOBAL tx_isolation = 'READ-UNCOMMITTED'; +SET GLOBAL transaction_isolation = 'READ-UNCOMMITTED'; connect con_int1,localhost,root,,; connection con_int1; -SELECT @@SESSION.tx_isolation; -@@SESSION.tx_isolation +SELECT @@SESSION.transaction_isolation; +@@SESSION.transaction_isolation READ-UNCOMMITTED READ-UNCOMMITTED Expected -SET SESSION tx_isolation = 'SERIALIZABLE'; +SET SESSION transaction_isolation = 'SERIALIZABLE'; connect con_int2,localhost,root,,; connection con_int2; -SELECT @@SESSION.tx_isolation; -@@SESSION.tx_isolation +SELECT @@SESSION.transaction_isolation; +@@SESSION.transaction_isolation READ-UNCOMMITTED READ-UNCOMMITTED Expected -SET SESSION tx_isolation = 'REPEATABLE-READ'; +SET SESSION transaction_isolation = 'REPEATABLE-READ'; connection con_int2; -SELECT @@SESSION.tx_isolation; -@@SESSION.tx_isolation +SELECT @@SESSION.transaction_isolation; +@@SESSION.transaction_isolation REPEATABLE-READ REPEATABLE-READ Expected connection con_int1; -SELECT @@SESSION.tx_isolation; -@@SESSION.tx_isolation +SELECT @@SESSION.transaction_isolation; +@@SESSION.transaction_isolation SERIALIZABLE SERIALIZABLE Expected -SELECT @@GLOBAL.tx_isolation; -@@GLOBAL.tx_isolation +SELECT @@GLOBAL.transaction_isolation; +@@GLOBAL.transaction_isolation READ-UNCOMMITTED READ-UNCOMMITTED Expected connection default; disconnect con_int1; disconnect con_int2; -SET @@SESSION.tx_isolation = @session_tx_isolation; -SET @@GLOBAL.tx_isolation = @global_tx_isolation; +SET @@SESSION.transaction_isolation = @session_transaction_isolation; +SET @@GLOBAL.transaction_isolation = @global_transaction_isolation; connection default; disconnect con0; disconnect con1; diff --git a/mysql-test/suite/sys_vars/r/transaction_read_only_basic.result b/mysql-test/suite/sys_vars/r/transaction_read_only_basic.result new file mode 100644 index 00000000..b0d1d8bc --- /dev/null +++ b/mysql-test/suite/sys_vars/r/transaction_read_only_basic.result @@ -0,0 +1,181 @@ +#################################################################### +# START OF transaction_read_only TESTS # +#################################################################### +############################################################# +# Save initial value # +############################################################# +SET @start_global_value = @@global.transaction_read_only; +SELECT @start_global_value; +@start_global_value +0 +SET @start_session_value = @@session.transaction_read_only; +SELECT @start_session_value; +@start_session_value +0 +######################################################################## +# Display the DEFAULT value of transaction_read_only # +######################################################################## +SET @@global.transaction_read_only = ON; +SET @@global.transaction_read_only = DEFAULT; +SELECT @@global.transaction_read_only; +@@global.transaction_read_only +0 +SET @@session.transaction_read_only = ON; +SET @@session.transaction_read_only = DEFAULT; +SELECT @@session.transaction_read_only; +@@session.transaction_read_only +0 +############################################################################### +# Change the value of transaction_read_only to a valid value for GLOBAL Scope # +############################################################################### +SET @@global.transaction_read_only = ON; +SELECT @@global.transaction_read_only; +@@global.transaction_read_only +1 +SET @@global.transaction_read_only = OFF; +SELECT @@global.transaction_read_only; +@@global.transaction_read_only +0 +SET @@global.transaction_read_only = 0; +SELECT @@global.transaction_read_only; +@@global.transaction_read_only +0 +SET @@global.transaction_read_only = 1; +SELECT @@global.transaction_read_only; +@@global.transaction_read_only +1 +SET @@global.transaction_read_only = TRUE; +SELECT @@global.transaction_read_only; +@@global.transaction_read_only +1 +SET @@global.transaction_read_only = FALSE; +SELECT @@global.transaction_read_only; +@@global.transaction_read_only +0 +################################################################################ +# Change the value of transaction_read_only to a valid value for SESSION Scope # +################################################################################ +SET @@session.transaction_read_only = ON; +SELECT @@session.transaction_read_only; +@@session.transaction_read_only +1 +SET @@session.transaction_read_only = OFF; +SELECT @@session.transaction_read_only; +@@session.transaction_read_only +0 +SET @@session.transaction_read_only = 0; +SELECT @@session.transaction_read_only; +@@session.transaction_read_only +0 +SET @@session.transaction_read_only = 1; +SELECT @@session.transaction_read_only; +@@session.transaction_read_only +1 +SET @@session.transaction_read_only = TRUE; +SELECT @@session.transaction_read_only; +@@session.transaction_read_only +1 +SET @@session.transaction_read_only = FALSE; +SELECT @@session.transaction_read_only; +@@session.transaction_read_only +0 +################################################################# +# Change the value of transaction_read_only to an invalid value # +################################################################# +SET @@global.transaction_read_only = 'ONN'; +ERROR 42000: Variable 'transaction_read_only' can't be set to the value of 'ONN' +SET @@global.transaction_read_only = "OFFF"; +ERROR 42000: Variable 'transaction_read_only' can't be set to the value of 'OFFF' +SET @@global.transaction_read_only = TTRUE; +ERROR 42000: Variable 'transaction_read_only' can't be set to the value of 'TTRUE' +SET @@global.transaction_read_only = FELSE; +ERROR 42000: Variable 'transaction_read_only' can't be set to the value of 'FELSE' +SET @@global.transaction_read_only = -1024; +ERROR 42000: Variable 'transaction_read_only' can't be set to the value of '-1024' +SET @@global.transaction_read_only = 65536; +ERROR 42000: Variable 'transaction_read_only' can't be set to the value of '65536' +SET @@global.transaction_read_only = 65530.34; +ERROR 42000: Incorrect argument type to variable 'transaction_read_only' +SET @@global.transaction_read_only = test; +ERROR 42000: Variable 'transaction_read_only' can't be set to the value of 'test' +SET @@session.transaction_read_only = ONN; +ERROR 42000: Variable 'transaction_read_only' can't be set to the value of 'ONN' +SET @@session.transaction_read_only = ONF; +ERROR 42000: Variable 'transaction_read_only' can't be set to the value of 'ONF' +SET @@session.transaction_read_only = OF; +ERROR 42000: Variable 'transaction_read_only' can't be set to the value of 'OF' +SET @@session.transaction_read_only = 'OFN'; +ERROR 42000: Variable 'transaction_read_only' can't be set to the value of 'OFN' +SET @@session.transaction_read_only = -2; +ERROR 42000: Variable 'transaction_read_only' can't be set to the value of '-2' +SET @@session.transaction_read_only = 65530.34; +ERROR 42000: Incorrect argument type to variable 'transaction_read_only' +SET @@session.transaction_read_only = 65550; +ERROR 42000: Variable 'transaction_read_only' can't be set to the value of '65550' +SET @@session.transaction_read_only = test; +ERROR 42000: Variable 'transaction_read_only' can't be set to the value of 'test' +SELECT @@session.transaction_read_only; +@@session.transaction_read_only +0 +#################################################################### +# Check if the value in GLOBAL Table matches value in variable # +#################################################################### +SELECT IF(@@global.transaction_read_only, "ON", "OFF") = VARIABLE_VALUE +FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES +WHERE VARIABLE_NAME='transaction_read_only'; +IF(@@global.transaction_read_only, "ON", "OFF") = VARIABLE_VALUE +1 +#################################################################### +# Check if the value in SESSION Table matches value in variable # +#################################################################### +SELECT IF(@@session.transaction_read_only, "ON", "OFF") = VARIABLE_VALUE +FROM INFORMATION_SCHEMA.SESSION_VARIABLES +WHERE VARIABLE_NAME='transaction_read_only'; +IF(@@session.transaction_read_only, "ON", "OFF") = VARIABLE_VALUE +1 +############################################################################### +# Check if accessing variable with and without GLOBAL point to same variable # +############################################################################### +SET @@transaction_read_only = OFF; +SET @@global.transaction_read_only = ON; +SELECT @@transaction_read_only = @@global.transaction_read_only; +@@transaction_read_only = @@global.transaction_read_only +0 +############################################################################## +# Check if accessing variable with SESSION,LOCAL and without SCOPE points # +# to same session variable # +############################################################################## +SET @@transaction_read_only = ON; +SELECT @@transaction_read_only = @@local.transaction_read_only; +@@transaction_read_only = @@local.transaction_read_only +1 +SELECT @@local.transaction_read_only = @@session.transaction_read_only; +@@local.transaction_read_only = @@session.transaction_read_only +1 +############################################################################### +# Check if transaction_read_only can be accessed with and without @@ sign # +############################################################################### +# @@session is synonym for SESSION +SET @@session.transaction_read_only= 0; +# Without modifier, SET changes session variable +SET transaction_read_only = 1; +SELECT @@transaction_read_only; +@@transaction_read_only +1 +# name1.name2 refers to database_name.table_name +SELECT session.transaction_read_only; +ERROR 42S02: Unknown table 'session' in field list +#################################### +# Restore initial value # +#################################### +SET @@global.transaction_read_only = @start_global_value; +SELECT @@global.transaction_read_only; +@@global.transaction_read_only +0 +SET @@session.transaction_read_only = @start_session_value; +SELECT @@session.transaction_read_only; +@@session.transaction_read_only +0 +######################################################### +# END OF transaction_read_only TESTS # +######################################################### diff --git a/mysql-test/suite/sys_vars/r/tx_compatibility.result b/mysql-test/suite/sys_vars/r/tx_compatibility.result new file mode 100644 index 00000000..4cf1cd61 --- /dev/null +++ b/mysql-test/suite/sys_vars/r/tx_compatibility.result @@ -0,0 +1,139 @@ +# +# MDEV-21921 Make transaction_isolation and transaction_read_only into +# system variables +# +SET @saved_global_isolation= @@global.transaction_isolation; +SET @saved_global_read_only= @@global.transaction_read_only; +# Case 1: Check the influence of --transaction_* on +# @@session.transaction_* and @@global.transaction_*, +# @@session.tx_*, @@global.tx_*. +SELECT @@session.transaction_isolation, @@global.transaction_isolation, +@@session.tx_isolation, @@global.tx_isolation; +@@session.transaction_isolation @@global.transaction_isolation @@session.tx_isolation @@global.tx_isolation +SERIALIZABLE SERIALIZABLE SERIALIZABLE SERIALIZABLE +SHOW GLOBAL VARIABLES LIKE '%_isolation'; +Variable_name Value +transaction_isolation SERIALIZABLE +tx_isolation SERIALIZABLE +SHOW SESSION VARIABLES LIKE '%_isolation'; +Variable_name Value +transaction_isolation SERIALIZABLE +tx_isolation SERIALIZABLE +SELECT @@session.transaction_read_only, @@global.transaction_read_only, +@@session.tx_read_only, @@global.tx_read_only; +@@session.transaction_read_only @@global.transaction_read_only @@session.tx_read_only @@global.tx_read_only +1 1 1 1 +SHOW GLOBAL VARIABLES LIKE '%_read_only'; +Variable_name Value +transaction_read_only ON +tx_read_only ON +SHOW SESSION VARIABLES LIKE '%_read_only'; +Variable_name Value +transaction_read_only ON +tx_read_only ON +# Case 2: Check that the change to tx_* is reflected to transaction_*. +SET tx_isolation= 'REPEATABLE-READ'; +Warnings: +Warning 1287 '@@tx_isolation' is deprecated and will be removed in a future release. Please use '@@transaction_isolation' instead +SET @@global.tx_isolation= 'SERIALIZABLE'; +Warnings: +Warning 1287 '@@tx_isolation' is deprecated and will be removed in a future release. Please use '@@transaction_isolation' instead +SELECT @@session.tx_isolation, @@global.tx_isolation, +@@session.transaction_isolation, @@global.transaction_isolation; +@@session.tx_isolation @@global.tx_isolation @@session.transaction_isolation @@global.transaction_isolation +REPEATABLE-READ SERIALIZABLE REPEATABLE-READ SERIALIZABLE +SHOW GLOBAL VARIABLES LIKE '%_isolation'; +Variable_name Value +transaction_isolation SERIALIZABLE +tx_isolation SERIALIZABLE +SHOW SESSION VARIABLES LIKE '%_isolation'; +Variable_name Value +transaction_isolation REPEATABLE-READ +tx_isolation REPEATABLE-READ +SET STATEMENT tx_isolation= 'SERIALIZABLE' FOR SHOW SESSION VARIABLES LIKE '%_isolation'; +Variable_name Value +transaction_isolation SERIALIZABLE +tx_isolation SERIALIZABLE +Warnings: +Warning 1287 '@@tx_isolation' is deprecated and will be removed in a future release. Please use '@@transaction_isolation' instead +Warning 1287 '@@tx_isolation' is deprecated and will be removed in a future release. Please use '@@transaction_isolation' instead +SHOW SESSION VARIABLES LIKE '%_isolation'; +Variable_name Value +transaction_isolation REPEATABLE-READ +tx_isolation REPEATABLE-READ +SET tx_read_only= OFF; +Warnings: +Warning 1287 '@@tx_read_only' is deprecated and will be removed in a future release. Please use '@@transaction_read_only' instead +SET @@global.tx_read_only= ON; +Warnings: +Warning 1287 '@@tx_read_only' is deprecated and will be removed in a future release. Please use '@@transaction_read_only' instead +SELECT @@session.tx_read_only, @@global.tx_read_only, +@@session.transaction_read_only, @@global.transaction_read_only; +@@session.tx_read_only @@global.tx_read_only @@session.transaction_read_only @@global.transaction_read_only +0 1 0 1 +SHOW GLOBAL VARIABLES LIKE '%_read_only'; +Variable_name Value +transaction_read_only ON +tx_read_only ON +SHOW SESSION VARIABLES LIKE '%_read_only'; +Variable_name Value +transaction_read_only OFF +tx_read_only OFF +SET STATEMENT tx_read_only= ON FOR SHOW SESSION VARIABLES LIKE '%_read_only'; +Variable_name Value +transaction_read_only ON +tx_read_only ON +Warnings: +Warning 1287 '@@tx_read_only' is deprecated and will be removed in a future release. Please use '@@transaction_read_only' instead +Warning 1287 '@@tx_read_only' is deprecated and will be removed in a future release. Please use '@@transaction_read_only' instead +SHOW SESSION VARIABLES LIKE '%_read_only'; +Variable_name Value +transaction_read_only OFF +tx_read_only OFF +# Case 3: Check that the change to transaction_* is reflected to tx_*. +SET transaction_isolation= 'SERIALIZABLE'; +SET @@global.transaction_isolation= 'REPEATABLE-READ'; +SELECT @@session.tx_isolation, @@global.tx_isolation, +@@session.transaction_isolation, @@global.transaction_isolation; +@@session.tx_isolation @@global.tx_isolation @@session.transaction_isolation @@global.transaction_isolation +SERIALIZABLE REPEATABLE-READ SERIALIZABLE REPEATABLE-READ +SHOW GLOBAL VARIABLES LIKE '%_isolation'; +Variable_name Value +transaction_isolation REPEATABLE-READ +tx_isolation REPEATABLE-READ +SHOW SESSION VARIABLES LIKE '%_isolation'; +Variable_name Value +transaction_isolation SERIALIZABLE +tx_isolation SERIALIZABLE +SET STATEMENT transaction_isolation= 'REPEATABLE-READ' FOR SHOW SESSION VARIABLES LIKE '%_isolation'; +Variable_name Value +transaction_isolation REPEATABLE-READ +tx_isolation REPEATABLE-READ +SHOW SESSION VARIABLES LIKE '%_isolation'; +Variable_name Value +transaction_isolation SERIALIZABLE +tx_isolation SERIALIZABLE +SET transaction_read_only= ON; +SET @@global.transaction_read_only= OFF; +SELECT @@session.tx_read_only, @@global.tx_read_only, +@@session.transaction_read_only, @@global.transaction_read_only; +@@session.tx_read_only @@global.tx_read_only @@session.transaction_read_only @@global.transaction_read_only +1 0 1 0 +SHOW GLOBAL VARIABLES LIKE '%_read_only'; +Variable_name Value +transaction_read_only OFF +tx_read_only OFF +SHOW SESSION VARIABLES LIKE '%_read_only'; +Variable_name Value +transaction_read_only ON +tx_read_only ON +SET STATEMENT transaction_read_only= OFF FOR SHOW SESSION VARIABLES LIKE '%_read_only'; +Variable_name Value +transaction_read_only OFF +tx_read_only OFF +SHOW SESSION VARIABLES LIKE '%_read_only'; +Variable_name Value +transaction_read_only ON +tx_read_only ON +SET @@global.transaction_isolation= @saved_global_isolation; +SET @@global.transaction_read_only= @saved_global_read_only; diff --git a/mysql-test/suite/sys_vars/r/tx_isolation_basic.result b/mysql-test/suite/sys_vars/r/tx_isolation_basic.result deleted file mode 100644 index f6ee2c92..00000000 --- a/mysql-test/suite/sys_vars/r/tx_isolation_basic.result +++ /dev/null @@ -1,141 +0,0 @@ -SET @global_start_value = @@global.tx_isolation; -SELECT @global_start_value; -@global_start_value -REPEATABLE-READ -SET @session_start_value = @@session.tx_isolation; -SELECT @session_start_value; -@session_start_value -REPEATABLE-READ -'#--------------------FN_DYNVARS_183_01------------------------#' -SET @@global.tx_isolation = 'READ-UNCOMMITTED'; -SET @@global.tx_isolation = DEFAULT; -SELECT @@global.tx_isolation; -@@global.tx_isolation -REPEATABLE-READ -SET @@session.tx_isolation = DEFAULT; -SELECT @@session.tx_isolation; -@@session.tx_isolation -REPEATABLE-READ -'#---------------------FN_DYNVARS_183_02-------------------------#' -SET @@global.tx_isolation = NULL; -ERROR 42000: Variable 'tx_isolation' can't be set to the value of 'NULL' -SET @@global.tx_isolation = ''; -ERROR 42000: Variable 'tx_isolation' can't be set to the value of '' -SET @@session.tx_isolation = NULL; -ERROR 42000: Variable 'tx_isolation' can't be set to the value of 'NULL' -SET @@session.tx_isolation = ''; -ERROR 42000: Variable 'tx_isolation' can't be set to the value of '' -'#--------------------FN_DYNVARS_183_03------------------------#' -SET @@global.tx_isolation = 'READ-UNCOMMITTED'; -SELECT @@global.tx_isolation; -@@global.tx_isolation -READ-UNCOMMITTED -SET @@global.tx_isolation = 'read-COMMITTED'; -SELECT @@global.tx_isolation; -@@global.tx_isolation -READ-COMMITTED -SET @@global.tx_isolation = 'REPEATABLE-READ'; -SELECT @@global.tx_isolation; -@@global.tx_isolation -REPEATABLE-READ -SET @@global.tx_isolation = 'SERIALIZable'; -SELECT @@global.tx_isolation; -@@global.tx_isolation -SERIALIZABLE -SET @@session.tx_isolation = 'READ-UNCOMMITTED'; -SELECT @@session.tx_isolation; -@@session.tx_isolation -READ-UNCOMMITTED -SET @@session.tx_isolation = 'READ-COMMITTED'; -SELECT @@session.tx_isolation; -@@session.tx_isolation -READ-COMMITTED -SET @@session.tx_isolation = 'REPEATABLE-READ'; -SELECT @@session.tx_isolation; -@@session.tx_isolation -REPEATABLE-READ -SET @@session.tx_isolation = 'serializable'; -SELECT @@session.tx_isolation; -@@session.tx_isolation -SERIALIZABLE -'#--------------------FN_DYNVARS_183_04-------------------------#' -SET @@global.tx_isolation = -1; -ERROR 42000: Variable 'tx_isolation' can't be set to the value of '-1' -SET @@global.tx_isolation = READUNCOMMITTED; -ERROR 42000: Variable 'tx_isolation' can't be set to the value of 'READUNCOMMITTED' -SET @@global.tx_isolation = 'REPEATABLE'; -ERROR 42000: Variable 'tx_isolation' can't be set to the value of 'REPEATABLE' -SET @@global.tx_isolation = OFF; -ERROR 42000: Variable 'tx_isolation' can't be set to the value of 'OFF' -SET @@global.tx_isolation = ON; -ERROR 42000: Variable 'tx_isolation' can't be set to the value of 'ON' -SET @@global.tx_isolation = 'NON-SERIALIZABLE'; -ERROR 42000: Variable 'tx_isolation' can't be set to the value of 'NON-SERIALIZABLE' -SET @@tx_isolation = -1; -ERROR 42000: Variable 'tx_isolation' can't be set to the value of '-1' -SET @@tx_isolation = READUNCOMMITTED; -ERROR 42000: Variable 'tx_isolation' can't be set to the value of 'READUNCOMMITTED' -SET @@tx_isolation = 'REPEATABLE'; -ERROR 42000: Variable 'tx_isolation' can't be set to the value of 'REPEATABLE' -SET @@tx_isolation = 'NONE'; -ERROR 42000: Variable 'tx_isolation' can't be set to the value of 'NONE' -SET @@tx_isolation = 'ALL'; -ERROR 42000: Variable 'tx_isolation' can't be set to the value of 'ALL' -'#-------------------FN_DYNVARS_183_05----------------------------#' -SELECT @@session.tx_isolation = VARIABLE_VALUE -FROM INFORMATION_SCHEMA.SESSION_VARIABLES -WHERE VARIABLE_NAME='tx_isolation'; -@@session.tx_isolation = VARIABLE_VALUE -1 -'#----------------------FN_DYNVARS_183_06------------------------#' -SELECT @@global.tx_isolation = VARIABLE_VALUE -FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES -WHERE VARIABLE_NAME='tx_isolation'; -@@global.tx_isolation = VARIABLE_VALUE -1 -'#---------------------FN_DYNVARS_183_07-------------------------#' -SET @@global.tx_isolation = 0; -SELECT @@global.tx_isolation; -@@global.tx_isolation -READ-UNCOMMITTED -SET @@global.tx_isolation = 1; -SELECT @@global.tx_isolation; -@@global.tx_isolation -READ-COMMITTED -SET @@global.tx_isolation = 2; -SELECT @@global.tx_isolation; -@@global.tx_isolation -REPEATABLE-READ -SET @@global.tx_isolation = 3; -SELECT @@global.tx_isolation; -@@global.tx_isolation -SERIALIZABLE -SET @@global.tx_isolation = 0.4; -ERROR 42000: Incorrect argument type to variable 'tx_isolation' -'#---------------------FN_DYNVARS_183_08----------------------#' -SET @@global.tx_isolation = TRUE; -SELECT @@global.tx_isolation; -@@global.tx_isolation -READ-COMMITTED -SET @@global.tx_isolation = FALSE; -SELECT @@global.tx_isolation; -@@global.tx_isolation -READ-UNCOMMITTED -'#---------------------FN_DYNVARS_183_09----------------------#' -SET tx_isolation = 'REPEATABLE-READ'; -SET session tx_isolation = 'REPEATABLE-READ'; -SELECT @@tx_isolation; -@@tx_isolation -REPEATABLE-READ -SET global tx_isolation = 'REPEATABLE-READ'; -SELECT @@global.tx_isolation; -@@global.tx_isolation -REPEATABLE-READ -SET @@global.tx_isolation = @global_start_value; -SELECT @@global.tx_isolation; -@@global.tx_isolation -REPEATABLE-READ -SET @@session.tx_isolation = @session_start_value; -SELECT @@session.tx_isolation; -@@session.tx_isolation -REPEATABLE-READ diff --git a/mysql-test/suite/sys_vars/r/tx_read_only_basic.result b/mysql-test/suite/sys_vars/r/tx_read_only_basic.result deleted file mode 100644 index 37501450..00000000 --- a/mysql-test/suite/sys_vars/r/tx_read_only_basic.result +++ /dev/null @@ -1,181 +0,0 @@ -#################################################################### -# START OF tx_read_only TESTS # -#################################################################### -############################################################# -# Save initial value # -############################################################# -SET @start_global_value = @@global.tx_read_only; -SELECT @start_global_value; -@start_global_value -0 -SET @start_session_value = @@session.tx_read_only; -SELECT @start_session_value; -@start_session_value -0 -######################################################################## -# Display the DEFAULT value of tx_read_only # -######################################################################## -SET @@global.tx_read_only = ON; -SET @@global.tx_read_only = DEFAULT; -SELECT @@global.tx_read_only; -@@global.tx_read_only -0 -SET @@session.tx_read_only = ON; -SET @@session.tx_read_only = DEFAULT; -SELECT @@session.tx_read_only; -@@session.tx_read_only -0 -############################################################################## -# Change the value of tx_read_only to a valid value for GLOBAL Scope # -############################################################################## -SET @@global.tx_read_only = ON; -SELECT @@global.tx_read_only; -@@global.tx_read_only -1 -SET @@global.tx_read_only = OFF; -SELECT @@global.tx_read_only; -@@global.tx_read_only -0 -SET @@global.tx_read_only = 0; -SELECT @@global.tx_read_only; -@@global.tx_read_only -0 -SET @@global.tx_read_only = 1; -SELECT @@global.tx_read_only; -@@global.tx_read_only -1 -SET @@global.tx_read_only = TRUE; -SELECT @@global.tx_read_only; -@@global.tx_read_only -1 -SET @@global.tx_read_only = FALSE; -SELECT @@global.tx_read_only; -@@global.tx_read_only -0 -############################################################################### -# Change the value of tx_read_only to a valid value for SESSION Scope # -############################################################################### -SET @@session.tx_read_only = ON; -SELECT @@session.tx_read_only; -@@session.tx_read_only -1 -SET @@session.tx_read_only = OFF; -SELECT @@session.tx_read_only; -@@session.tx_read_only -0 -SET @@session.tx_read_only = 0; -SELECT @@session.tx_read_only; -@@session.tx_read_only -0 -SET @@session.tx_read_only = 1; -SELECT @@session.tx_read_only; -@@session.tx_read_only -1 -SET @@session.tx_read_only = TRUE; -SELECT @@session.tx_read_only; -@@session.tx_read_only -1 -SET @@session.tx_read_only = FALSE; -SELECT @@session.tx_read_only; -@@session.tx_read_only -0 -################################################################ -# Change the value of tx_read_only to an invalid value # -################################################################ -SET @@global.tx_read_only = 'ONN'; -ERROR 42000: Variable 'tx_read_only' can't be set to the value of 'ONN' -SET @@global.tx_read_only = "OFFF"; -ERROR 42000: Variable 'tx_read_only' can't be set to the value of 'OFFF' -SET @@global.tx_read_only = TTRUE; -ERROR 42000: Variable 'tx_read_only' can't be set to the value of 'TTRUE' -SET @@global.tx_read_only = FELSE; -ERROR 42000: Variable 'tx_read_only' can't be set to the value of 'FELSE' -SET @@global.tx_read_only = -1024; -ERROR 42000: Variable 'tx_read_only' can't be set to the value of '-1024' -SET @@global.tx_read_only = 65536; -ERROR 42000: Variable 'tx_read_only' can't be set to the value of '65536' -SET @@global.tx_read_only = 65530.34; -ERROR 42000: Incorrect argument type to variable 'tx_read_only' -SET @@global.tx_read_only = test; -ERROR 42000: Variable 'tx_read_only' can't be set to the value of 'test' -SET @@session.tx_read_only = ONN; -ERROR 42000: Variable 'tx_read_only' can't be set to the value of 'ONN' -SET @@session.tx_read_only = ONF; -ERROR 42000: Variable 'tx_read_only' can't be set to the value of 'ONF' -SET @@session.tx_read_only = OF; -ERROR 42000: Variable 'tx_read_only' can't be set to the value of 'OF' -SET @@session.tx_read_only = 'OFN'; -ERROR 42000: Variable 'tx_read_only' can't be set to the value of 'OFN' -SET @@session.tx_read_only = -2; -ERROR 42000: Variable 'tx_read_only' can't be set to the value of '-2' -SET @@session.tx_read_only = 65530.34; -ERROR 42000: Incorrect argument type to variable 'tx_read_only' -SET @@session.tx_read_only = 65550; -ERROR 42000: Variable 'tx_read_only' can't be set to the value of '65550' -SET @@session.tx_read_only = test; -ERROR 42000: Variable 'tx_read_only' can't be set to the value of 'test' -SELECT @@session.tx_read_only; -@@session.tx_read_only -0 -#################################################################### -# Check if the value in GLOBAL Table matches value in variable # -#################################################################### -SELECT IF(@@global.tx_read_only, "ON", "OFF") = VARIABLE_VALUE -FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES -WHERE VARIABLE_NAME='tx_read_only'; -IF(@@global.tx_read_only, "ON", "OFF") = VARIABLE_VALUE -1 -#################################################################### -# Check if the value in SESSION Table matches value in variable # -#################################################################### -SELECT IF(@@session.tx_read_only, "ON", "OFF") = VARIABLE_VALUE -FROM INFORMATION_SCHEMA.SESSION_VARIABLES -WHERE VARIABLE_NAME='tx_read_only'; -IF(@@session.tx_read_only, "ON", "OFF") = VARIABLE_VALUE -1 -############################################################################### -# Check if accessing variable with and without GLOBAL point to same variable # -############################################################################### -SET @@tx_read_only = OFF; -SET @@global.tx_read_only = ON; -SELECT @@tx_read_only = @@global.tx_read_only; -@@tx_read_only = @@global.tx_read_only -0 -############################################################################## -# Check if accessing variable with SESSION,LOCAL and without SCOPE points # -# to same session variable # -############################################################################## -SET @@tx_read_only = ON; -SELECT @@tx_read_only = @@local.tx_read_only; -@@tx_read_only = @@local.tx_read_only -1 -SELECT @@local.tx_read_only = @@session.tx_read_only; -@@local.tx_read_only = @@session.tx_read_only -1 -############################################################################### -# Check if tx_read_only can be accessed with and without @@ sign # -############################################################################### -# @@session is synonym for SESSION -SET @@session.tx_read_only= 0; -# Without modifier, SET changes session variable -SET tx_read_only = 1; -SELECT @@tx_read_only; -@@tx_read_only -1 -# name1.name2 refers to database_name.table_name -SELECT session.tx_read_only; -ERROR 42S02: Unknown table 'session' in field list -#################################### -# Restore initial value # -#################################### -SET @@global.tx_read_only = @start_global_value; -SELECT @@global.tx_read_only; -@@global.tx_read_only -0 -SET @@session.tx_read_only = @start_session_value; -SELECT @@session.tx_read_only; -@@session.tx_read_only -0 -######################################################### -# END OF tx_read_only TESTS # -######################################################### diff --git a/mysql-test/suite/sys_vars/r/wsrep_causal_reads_basic.result b/mysql-test/suite/sys_vars/r/wsrep_causal_reads_basic.result deleted file mode 100644 index b5f0c073..00000000 --- a/mysql-test/suite/sys_vars/r/wsrep_causal_reads_basic.result +++ /dev/null @@ -1,64 +0,0 @@ -# -# wsrep_causal_reads -# -# save the initial values -SET @wsrep_causal_reads_global_saved = @@global.wsrep_causal_reads; -SET @wsrep_causal_reads_session_saved = @@session.wsrep_causal_reads; -# default -SELECT @@global.wsrep_causal_reads; -@@global.wsrep_causal_reads -0 -SELECT @@session.wsrep_causal_reads; -@@session.wsrep_causal_reads -0 - -# scope and valid values -SET @@global.wsrep_causal_reads=OFF; -Warnings: -Warning 1287 '@@wsrep_causal_reads' is deprecated and will be removed in a future release. Please use '@@wsrep_sync_wait=1' instead -SELECT @@global.wsrep_causal_reads; -@@global.wsrep_causal_reads -0 -SET @@global.wsrep_causal_reads=ON; -Warnings: -Warning 1287 '@@wsrep_causal_reads' is deprecated and will be removed in a future release. Please use '@@wsrep_sync_wait=1' instead -SELECT @@global.wsrep_causal_reads; -@@global.wsrep_causal_reads -1 -SET @@session.wsrep_causal_reads=OFF; -Warnings: -Warning 1287 '@@wsrep_causal_reads' is deprecated and will be removed in a future release. Please use '@@wsrep_sync_wait=1' instead -SELECT @@session.wsrep_causal_reads; -@@session.wsrep_causal_reads -0 -SET @@session.wsrep_causal_reads=ON; -Warnings: -Warning 1287 '@@wsrep_causal_reads' is deprecated and will be removed in a future release. Please use '@@wsrep_sync_wait=1' instead -SELECT @@session.wsrep_causal_reads; -@@session.wsrep_causal_reads -1 -SET @@session.wsrep_causal_reads=default; -Warnings: -Warning 1287 '@@wsrep_causal_reads' is deprecated and will be removed in a future release. Please use '@@wsrep_sync_wait=1' instead -SELECT @@session.wsrep_causal_reads; -@@session.wsrep_causal_reads -1 - -# invalid values -SET @@global.wsrep_causal_reads=NULL; -ERROR 42000: Variable 'wsrep_causal_reads' can't be set to the value of 'NULL' -SET @@global.wsrep_causal_reads='junk'; -ERROR 42000: Variable 'wsrep_causal_reads' can't be set to the value of 'junk' -SET @@session.wsrep_causal_reads=NULL; -ERROR 42000: Variable 'wsrep_causal_reads' can't be set to the value of 'NULL' -SET @@session.wsrep_causal_reads='junk'; -ERROR 42000: Variable 'wsrep_causal_reads' can't be set to the value of 'junk' - -# restore the initial values -SET @@global.wsrep_causal_reads = @wsrep_causal_reads_global_saved; -Warnings: -Warning 1287 '@@wsrep_causal_reads' is deprecated and will be removed in a future release. Please use '@@wsrep_sync_wait=1' instead -SET @@session.wsrep_causal_reads = @wsrep_causal_reads_session_saved; -Warnings: -Warning 1287 '@@wsrep_causal_reads' is deprecated and will be removed in a future release. Please use '@@wsrep_sync_wait=1' instead -# End of test |