diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-07-01 18:15:00 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-07-01 18:15:00 +0000 |
| commit | a2a2e32c02643a0cec111511220227703fda1cd5 (patch) | |
| tree | 69cc2b631234c2a8e026b9cd4d72676c61c594df /mysql-test/suite/sys_vars/t | |
| parent | Releasing progress-linux version 1:10.11.8-1~progress7.99u1. (diff) | |
| download | mariadb-a2a2e32c02643a0cec111511220227703fda1cd5.tar.xz mariadb-a2a2e32c02643a0cec111511220227703fda1cd5.zip | |
Merging upstream version 1:11.4.2.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'mysql-test/suite/sys_vars/t')
64 files changed, 526 insertions, 1559 deletions
diff --git a/mysql-test/suite/sys_vars/t/binlog_direct_non_transactional_updates_grant.test b/mysql-test/suite/sys_vars/t/binlog_direct_non_transactional_updates_grant.test index 7de1a119..98970a43 100644 --- a/mysql-test/suite/sys_vars/t/binlog_direct_non_transactional_updates_grant.test +++ b/mysql-test/suite/sys_vars/t/binlog_direct_non_transactional_updates_grant.test @@ -3,16 +3,15 @@ source include/have_log_bin.inc; SET @global= @@global.binlog_direct_non_transactional_updates; SET @session= @@global.binlog_direct_non_transactional_updates; - --echo # --echo # --echo # ---echo # Test that "SET binlog_direct_non_transactional_updates" is not allowed without BINLOG ADMIN or SUPER +--echo # 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 --error ER_SPECIFIC_ACCESS_DENIED_ERROR @@ -38,19 +37,5 @@ SET SESSION binlog_direct_non_transactional_updates=0; --connection default DROP USER user1@localhost; ---echo # 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/t/binlog_format_grant.test b/mysql-test/suite/sys_vars/t/binlog_format_grant.test index 6f89c75a..6f834db4 100644 --- a/mysql-test/suite/sys_vars/t/binlog_format_grant.test +++ b/mysql-test/suite/sys_vars/t/binlog_format_grant.test @@ -1,15 +1,14 @@ source include/have_log_bin.inc; - --echo # --echo # --echo # ---echo # Test that "SET binlog_format" is not allowed without BINLOG ADMIN or SUPER +--echo # 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 --error ER_SPECIFIC_ACCESS_DENIED_ERROR @@ -34,16 +33,3 @@ SET SESSION binlog_format=mixed; --disconnect user1 --connection default DROP USER user1@localhost; - ---echo # 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/t/connect_timeout_grant.test b/mysql-test/suite/sys_vars/t/connect_timeout_grant.test index 61a7a3eb..fa90b79e 100644 --- a/mysql-test/suite/sys_vars/t/connect_timeout_grant.test +++ b/mysql-test/suite/sys_vars/t/connect_timeout_grant.test @@ -6,11 +6,11 @@ SET @global=@@global.connect_timeout; --echo # MDEV-21961 Bind CONNECTION ADMIN to a number of global system variables --echo # ---echo # Test that "SET connect_timeout" is not allowed without CONNECTION ADMIN or SUPER +--echo # 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 --error ER_SPECIFIC_ACCESS_DENIED_ERROR @@ -38,19 +38,4 @@ SET SESSION connect_timeout=10; --connection default DROP USER user1@localhost; ---echo # 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; ---error ER_GLOBAL_VARIABLE -SET connect_timeout=10; ---error ER_GLOBAL_VARIABLE -SET SESSION connect_timeout=10; ---disconnect user1 ---connection default -DROP USER user1@localhost; - SET @@global.connect_timeout=@global; diff --git a/mysql-test/suite/sys_vars/t/date_format_basic.test b/mysql-test/suite/sys_vars/t/date_format_basic.test deleted file mode 100644 index a69295b4..00000000 --- a/mysql-test/suite/sys_vars/t/date_format_basic.test +++ /dev/null @@ -1,18 +0,0 @@ -# -# show the global and session values; -# -select @@global.date_format; ---error ER_INCORRECT_GLOBAL_LOCAL_VAR -select @@session.date_format; -show global variables like 'date_format'; -show session variables like 'date_format'; -select * from information_schema.global_variables where variable_name='date_format'; -select * from information_schema.session_variables where variable_name='date_format'; - -# -# show that it's read-only -# ---error ER_INCORRECT_GLOBAL_LOCAL_VAR -set global date_format="foo"; ---error ER_INCORRECT_GLOBAL_LOCAL_VAR -set session date_format="foo"; diff --git a/mysql-test/suite/sys_vars/t/datetime_format_basic.test b/mysql-test/suite/sys_vars/t/datetime_format_basic.test deleted file mode 100644 index 553d3126..00000000 --- a/mysql-test/suite/sys_vars/t/datetime_format_basic.test +++ /dev/null @@ -1,18 +0,0 @@ -# -# show the global and session values; -# -select @@global.datetime_format; ---error ER_INCORRECT_GLOBAL_LOCAL_VAR -select @@session.datetime_format; -show global variables like 'datetime_format'; -show session variables like 'datetime_format'; -select * from information_schema.global_variables where variable_name='datetime_format'; -select * from information_schema.session_variables where variable_name='datetime_format'; - -# -# show that it's read-only -# ---error ER_INCORRECT_GLOBAL_LOCAL_VAR -set global datetime_format="foo"; ---error ER_INCORRECT_GLOBAL_LOCAL_VAR -set session datetime_format="foo"; diff --git a/mysql-test/suite/sys_vars/t/debug_basic.test b/mysql-test/suite/sys_vars/t/debug_basic.test deleted file mode 100644 index b54626c3..00000000 --- a/mysql-test/suite/sys_vars/t/debug_basic.test +++ /dev/null @@ -1,22 +0,0 @@ ---source include/have_debug.inc -# -# exists both as global and session -# -set session debug="L"; - -select @@global.debug="1"; # just to show that global.debug exists -select @@session.debug; # here we know the value and can display it ---replace_column 2 # -show global variables like 'debug'; -show session variables like 'debug'; ---replace_column 2 # -select * from information_schema.global_variables where variable_name="debug"; -select * from information_schema.session_variables where variable_name="debug"; - ---error ER_WRONG_TYPE_FOR_VAR -set @@global.debug=1; ---error ER_WRONG_TYPE_FOR_VAR -set @@global.debug=1.1; ---error ER_WRONG_TYPE_FOR_VAR -set @@global.debug=1e1; - diff --git a/mysql-test/suite/sys_vars/t/debug_dbug_basic.test b/mysql-test/suite/sys_vars/t/debug_dbug_basic.test index 44471bf1..fb597a67 100644 --- a/mysql-test/suite/sys_vars/t/debug_dbug_basic.test +++ b/mysql-test/suite/sys_vars/t/debug_dbug_basic.test @@ -4,14 +4,14 @@ # set session debug_dbug="L"; -select @@global.debug_dbug="1"; # just to show that global.debug exists -select @@session.debug; # here we know the value and can display it +select @@global.debug_dbug="1"; # just to show that global.debug_dbug exists +select @@session.debug_dbug; # here we know the value and can display it --replace_column 2 # -show global variables like 'debug'; -show session variables like 'debug'; +show global variables like 'debug_dbug'; +show session variables like 'debug_dbug'; --replace_column 2 # -select * from information_schema.global_variables where variable_name="debug"; -select * from information_schema.session_variables where variable_name="debug"; +select * from information_schema.global_variables where variable_name='debug_dbug'; +select * from information_schema.session_variables where variable_name='debug_dbug'; --error ER_WRONG_TYPE_FOR_VAR set @@global.debug_dbug=1; diff --git a/mysql-test/suite/sys_vars/t/debug_dbug_func_notembedded.test b/mysql-test/suite/sys_vars/t/debug_dbug_func_notembedded.test index cb379746..4088525b 100644 --- a/mysql-test/suite/sys_vars/t/debug_dbug_func_notembedded.test +++ b/mysql-test/suite/sys_vars/t/debug_dbug_func_notembedded.test @@ -1,5 +1,5 @@ # -# Checks that assigning variable 'debug' in one session has no influence on +# Checks that assigning variable 'debug_dbug' in one session has no influence on # other session. (BUG#45632 of bugs.mysql.com) # # (this will not work with embedded server because mysqltest_embedded uses the @@ -14,17 +14,17 @@ connect(con2,localhost,root,,test,,); # makes output independant of current debug status connection con1; set session debug_dbug="t"; -show session variables like 'debug'; +show session variables like 'debug_dbug'; connection con2; set session debug_dbug="t"; -show session variables like 'debug'; +show session variables like 'debug_dbug'; # checks influence one session debug variable on another connection con1; set session debug_dbug="d:t"; -show session variables like 'debug'; +show session variables like 'debug_dbug'; connection con2; -show session variables like 'debug'; +show session variables like 'debug_dbug'; disconnect con1; disconnect con2; diff --git a/mysql-test/suite/sys_vars/t/debug_no_thread_alarm_basic.test b/mysql-test/suite/sys_vars/t/debug_no_thread_alarm_basic.test deleted file mode 100644 index 39823ba2..00000000 --- a/mysql-test/suite/sys_vars/t/debug_no_thread_alarm_basic.test +++ /dev/null @@ -1,21 +0,0 @@ -# bool readonly - -# -# show values; -# -select @@global.debug_no_thread_alarm; ---error ER_INCORRECT_GLOBAL_LOCAL_VAR -select @@session.debug_no_thread_alarm; -show global variables like 'debug_no_thread_alarm'; -show session variables like 'debug_no_thread_alarm'; -select * from information_schema.global_variables where variable_name='debug_no_thread_alarm'; -select * from information_schema.session_variables where variable_name='debug_no_thread_alarm'; - -# -# show that it's read-only -# ---error ER_INCORRECT_GLOBAL_LOCAL_VAR -set global debug_no_thread_alarm=1; ---error ER_INCORRECT_GLOBAL_LOCAL_VAR -set session debug_no_thread_alarm=1; - diff --git a/mysql-test/suite/sys_vars/t/disconnect_on_expired_password_grant.test b/mysql-test/suite/sys_vars/t/disconnect_on_expired_password_grant.test index 0d317d29..e901d944 100644 --- a/mysql-test/suite/sys_vars/t/disconnect_on_expired_password_grant.test +++ b/mysql-test/suite/sys_vars/t/disconnect_on_expired_password_grant.test @@ -6,11 +6,11 @@ SET @global=@@global.disconnect_on_expired_password; --echo # MDEV-21961 Bind CONNECTION ADMIN to a number of global system variables --echo # ---echo # Test that "SET disconnect_on_expired_password" is not allowed without CONNECTION ADMIN or SUPER +--echo # 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 --error ER_SPECIFIC_ACCESS_DENIED_ERROR @@ -38,19 +38,4 @@ SET SESSION disconnect_on_expired_password=1; --connection default DROP USER user1@localhost; ---echo # 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; ---error ER_GLOBAL_VARIABLE -SET disconnect_on_expired_password=1; ---error ER_GLOBAL_VARIABLE -SET SESSION disconnect_on_expired_password=1; ---disconnect user1 ---connection default -DROP USER user1@localhost; - SET @@global.disconnect_on_expired_password=@global; diff --git a/mysql-test/suite/sys_vars/t/extra_max_connections_grant.test b/mysql-test/suite/sys_vars/t/extra_max_connections_grant.test index 058364ec..de35fa2c 100644 --- a/mysql-test/suite/sys_vars/t/extra_max_connections_grant.test +++ b/mysql-test/suite/sys_vars/t/extra_max_connections_grant.test @@ -6,11 +6,11 @@ SET @global=@@global.extra_max_connections; --echo # MDEV-21961 Bind CONNECTION ADMIN to a number of global system variables --echo # ---echo # Test that "SET extra_max_connections" is not allowed without CONNECTION ADMIN or SUPER +--echo # 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 --error ER_SPECIFIC_ACCESS_DENIED_ERROR @@ -38,19 +38,4 @@ SET SESSION extra_max_connections=10; --connection default DROP USER user1@localhost; ---echo # 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; ---error ER_GLOBAL_VARIABLE -SET extra_max_connections=10; ---error ER_GLOBAL_VARIABLE -SET SESSION extra_max_connections=10; ---disconnect user1 ---connection default -DROP USER user1@localhost; - SET @@global.extra_max_connections=@global; diff --git a/mysql-test/suite/sys_vars/t/gtid_binlog_state_grant.test b/mysql-test/suite/sys_vars/t/gtid_binlog_state_grant.test index b1cfa320..b08a439c 100644 --- a/mysql-test/suite/sys_vars/t/gtid_binlog_state_grant.test +++ b/mysql-test/suite/sys_vars/t/gtid_binlog_state_grant.test @@ -1,6 +1,5 @@ --source include/not_embedded.inc - --echo # --echo # MDEV-21973 Bind REPLICATION {MASTER|SLAVE} ADMIN to gtid_* GLOBAL-only system variables --echo # @@ -11,17 +10,15 @@ # or "Binlog closed, cannot RESET MASTER" on success. # - --let var = gtid_binlog_state --let grant = REPLICATION MASTER ADMIN --let value = '0-1-10' - ---echo # Test that "SET $var" is not allowed without $grant or SUPER +--echo # Test that "SET $var" is not allowed without $grant CREATE USER user1@localhost; GRANT ALL PRIVILEGES ON *.* TO user1@localhost; ---eval REVOKE $grant, SUPER ON *.* FROM user1@localhost +--eval REVOKE $grant ON *.* FROM user1@localhost --connect(user1,localhost,user1,,) --connection user1 --error ER_SPECIFIC_ACCESS_DENIED_ERROR @@ -49,19 +46,3 @@ CREATE USER user1@localhost; --disconnect user1 --connection default DROP USER user1@localhost; - ---echo # Test that "SET $var" is allowed with SUPER - -CREATE USER user1@localhost; -GRANT SUPER ON *.* TO user1@localhost; ---connect(user1,localhost,user1,,) ---connection user1 ---error ER_FLUSH_MASTER_BINLOG_CLOSED ---eval SET GLOBAL $var=$value ---error ER_GLOBAL_VARIABLE ---eval SET $var=$value ---error ER_GLOBAL_VARIABLE ---eval SET SESSION $var=$value ---disconnect user1 ---connection default -DROP USER user1@localhost; diff --git a/mysql-test/suite/sys_vars/t/init_connect_grant.test b/mysql-test/suite/sys_vars/t/init_connect_grant.test index 685f0900..8f211459 100644 --- a/mysql-test/suite/sys_vars/t/init_connect_grant.test +++ b/mysql-test/suite/sys_vars/t/init_connect_grant.test @@ -6,11 +6,11 @@ SET @global=@@global.init_connect; --echo # MDEV-21961 Bind CONNECTION ADMIN to a number of global system variables --echo # ---echo # Test that "SET init_connect" is not allowed without CONNECTION ADMIN or SUPER +--echo # 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 --error ER_SPECIFIC_ACCESS_DENIED_ERROR @@ -38,19 +38,4 @@ SET SESSION init_connect="SET @xxx=1"; --connection default DROP USER user1@localhost; ---echo # 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"; ---error ER_GLOBAL_VARIABLE -SET init_connect="SET @xxx=1"; ---error ER_GLOBAL_VARIABLE -SET SESSION init_connect="SET @xxx=1"; ---disconnect user1 ---connection default -DROP USER user1@localhost; - SET @@global.init_connect=@global; diff --git a/mysql-test/suite/sys_vars/t/innodb_change_buffer_max_size_basic.test b/mysql-test/suite/sys_vars/t/innodb_change_buffer_max_size_basic.test deleted file mode 100644 index 2094ef3d..00000000 --- a/mysql-test/suite/sys_vars/t/innodb_change_buffer_max_size_basic.test +++ /dev/null @@ -1,71 +0,0 @@ - - -# 2011-02-09 - Added -# - ---source include/have_innodb.inc - -SET @start_global_value = @@global.innodb_change_buffer_max_size; -SELECT @start_global_value; - -# -# exists as global only -# ---echo Valid values are between 0 and 50 -select @@global.innodb_change_buffer_max_size between 0 and 50; -select @@global.innodb_change_buffer_max_size; ---error ER_INCORRECT_GLOBAL_LOCAL_VAR -select @@session.innodb_change_buffer_max_size; -show global variables like 'innodb_change_buffer_max_size'; -show session variables like 'innodb_change_buffer_max_size'; ---disable_warnings -select * from information_schema.global_variables where variable_name='innodb_change_buffer_max_size'; -select * from information_schema.session_variables where variable_name='innodb_change_buffer_max_size'; ---enable_warnings - -# -# show that it's writable -# -set global innodb_change_buffer_max_size=10; -select @@global.innodb_change_buffer_max_size; ---disable_warnings -select * from information_schema.global_variables where variable_name='innodb_change_buffer_max_size'; -select * from information_schema.session_variables where variable_name='innodb_change_buffer_max_size'; ---enable_warnings ---error ER_GLOBAL_VARIABLE -set session innodb_change_buffer_max_size=1; - -# -# incorrect types -# ---error ER_WRONG_TYPE_FOR_VAR -set global innodb_change_buffer_max_size=1.1; ---error ER_WRONG_TYPE_FOR_VAR -set global innodb_change_buffer_max_size=1e1; ---error ER_WRONG_TYPE_FOR_VAR -set global innodb_change_buffer_max_size="foo"; - -set global innodb_change_buffer_max_size=-7; -select @@global.innodb_change_buffer_max_size; ---disable_warnings -select * from information_schema.global_variables where variable_name='innodb_change_buffer_max_size'; ---enable_warnings -set global innodb_change_buffer_max_size=56; -select @@global.innodb_change_buffer_max_size; ---disable_warnings -select * from information_schema.global_variables where variable_name='innodb_change_buffer_max_size'; ---enable_warnings - -# -# min/max/DEFAULT values -# -set global innodb_change_buffer_max_size=0; -select @@global.innodb_change_buffer_max_size; -set global innodb_change_buffer_max_size=50; -select @@global.innodb_change_buffer_max_size; -set global innodb_change_buffer_max_size=DEFAULT; -select @@global.innodb_change_buffer_max_size; - - -SET @@global.innodb_change_buffer_max_size = @start_global_value; -SELECT @@global.innodb_change_buffer_max_size; diff --git a/mysql-test/suite/sys_vars/t/innodb_change_buffering_basic.test b/mysql-test/suite/sys_vars/t/innodb_change_buffering_basic.test deleted file mode 100644 index 19f0890f..00000000 --- a/mysql-test/suite/sys_vars/t/innodb_change_buffering_basic.test +++ /dev/null @@ -1,65 +0,0 @@ - - -# 2010-01-25 - Added -# - ---source include/have_innodb.inc - -SET @start_global_value = @@global.innodb_change_buffering; -SELECT @start_global_value; - -# -# exists as global only -# ---echo Valid values are 'all', 'deletes', 'changes', 'inserts', 'none', 'purges' -select @@global.innodb_change_buffering in ('all', 'deletes', 'changes', 'inserts', 'none', 'purges'); -select @@global.innodb_change_buffering; ---error ER_INCORRECT_GLOBAL_LOCAL_VAR -select @@session.innodb_change_buffering; -show global variables like 'innodb_change_buffering'; -show session variables like 'innodb_change_buffering'; ---disable_warnings -select * from information_schema.global_variables where variable_name='innodb_change_buffering'; -select * from information_schema.session_variables where variable_name='innodb_change_buffering'; ---enable_warnings - -# -# show that it's writable -# -set global innodb_change_buffering='none'; -select @@global.innodb_change_buffering; ---disable_warnings -select * from information_schema.global_variables where variable_name='innodb_change_buffering'; -select * from information_schema.session_variables where variable_name='innodb_change_buffering'; ---enable_warnings -set @@global.innodb_change_buffering='inserts'; -select @@global.innodb_change_buffering; ---disable_warnings -select * from information_schema.global_variables where variable_name='innodb_change_buffering'; -select * from information_schema.session_variables where variable_name='innodb_change_buffering'; ---enable_warnings ---error ER_GLOBAL_VARIABLE -set session innodb_change_buffering='some'; ---error ER_GLOBAL_VARIABLE -set @@session.innodb_change_buffering='some'; - -# -# incorrect types -# ---error ER_WRONG_TYPE_FOR_VAR -set global innodb_change_buffering=1.1; -set global innodb_change_buffering=1; -SELECT @@global.innodb_change_buffering; ---error ER_WRONG_VALUE_FOR_VAR -set global innodb_change_buffering=-2; ---error ER_WRONG_TYPE_FOR_VAR -set global innodb_change_buffering=1e1; ---error ER_WRONG_VALUE_FOR_VAR -set global innodb_change_buffering='some'; - -# -# Cleanup -# - -SET @@global.innodb_change_buffering = @start_global_value; -SELECT @@global.innodb_change_buffering; diff --git a/mysql-test/suite/sys_vars/t/innodb_change_buffering_debug_basic.test b/mysql-test/suite/sys_vars/t/innodb_change_buffering_debug_basic.test deleted file mode 100644 index 70f8bee1..00000000 --- a/mysql-test/suite/sys_vars/t/innodb_change_buffering_debug_basic.test +++ /dev/null @@ -1,59 +0,0 @@ ---source include/have_innodb.inc ---source include/have_debug.inc - -SET @start_global_value = @@global.innodb_change_buffering_debug; -SELECT @start_global_value; - -# -# exists as global only -# -select @@global.innodb_change_buffering_debug in (0, 1); -select @@global.innodb_change_buffering_debug; ---error ER_INCORRECT_GLOBAL_LOCAL_VAR -select @@session.innodb_change_buffering_debug; -show global variables like 'innodb_change_buffering_debug'; -show session variables like 'innodb_change_buffering_debug'; ---disable_warnings -select * from information_schema.global_variables where variable_name='innodb_change_buffering_debug'; -select * from information_schema.session_variables where variable_name='innodb_change_buffering_debug'; ---enable_warnings - -# -# show that it's writable -# -set global innodb_change_buffering_debug=1; -select @@global.innodb_change_buffering_debug; ---disable_warnings -select * from information_schema.global_variables where variable_name='innodb_change_buffering_debug'; -select * from information_schema.session_variables where variable_name='innodb_change_buffering_debug'; ---enable_warnings -set @@global.innodb_change_buffering_debug=0; -select @@global.innodb_change_buffering_debug; ---disable_warnings -select * from information_schema.global_variables where variable_name='innodb_change_buffering_debug'; -select * from information_schema.session_variables where variable_name='innodb_change_buffering_debug'; ---enable_warnings ---error ER_GLOBAL_VARIABLE -set session innodb_change_buffering_debug='some'; ---error ER_GLOBAL_VARIABLE -set @@session.innodb_change_buffering_debug='some'; - -# -# incorrect types -# ---error ER_WRONG_TYPE_FOR_VAR -set global innodb_change_buffering_debug=1.1; ---error ER_WRONG_TYPE_FOR_VAR -set global innodb_change_buffering_debug='foo'; -set global innodb_change_buffering_debug=-2; ---error ER_WRONG_TYPE_FOR_VAR -set global innodb_change_buffering_debug=1e1; -set global innodb_change_buffering_debug=2; -select @@global.innodb_change_buffering_debug; - -# -# Cleanup -# - -SET @@global.innodb_change_buffering_debug = @start_global_value; -SELECT @@global.innodb_change_buffering_debug; diff --git a/mysql-test/suite/sys_vars/t/innodb_defragment_basic.test b/mysql-test/suite/sys_vars/t/innodb_defragment_basic.test deleted file mode 100644 index 9667f63f..00000000 --- a/mysql-test/suite/sys_vars/t/innodb_defragment_basic.test +++ /dev/null @@ -1,20 +0,0 @@ --- source include/have_innodb.inc - -# Check the default value -SET @orig = @@global.innodb_defragment; -SELECT @orig; - -# Turn off -SET GLOBAL innodb_defragment = OFF; -SELECT @@global.innodb_defragment; - -# Turn on -SET GLOBAL innodb_defragment = ON; -SELECT @@global.innodb_defragment; - -# Wrong value ---error ER_WRONG_VALUE_FOR_VAR -SET GLOBAL innodb_defragment = 100; -SELECT @@global.innodb_defragment; - -SET GLOBAL innodb_defragment = @orig; diff --git a/mysql-test/suite/sys_vars/t/innodb_defragment_fill_factor_basic.test b/mysql-test/suite/sys_vars/t/innodb_defragment_fill_factor_basic.test deleted file mode 100644 index ae9863e8..00000000 --- a/mysql-test/suite/sys_vars/t/innodb_defragment_fill_factor_basic.test +++ /dev/null @@ -1,27 +0,0 @@ ---source include/have_innodb.inc - -SET @start_innodb_defragment_fill_factor = @@global.innodb_defragment_fill_factor; -SELECT @start_innodb_defragment_fill_factor; - -SELECT COUNT(@@global.innodb_defragment_fill_factor); - -SET @@global.innodb_defragment_fill_factor = 0.77777777777777; -SELECT @@global.innodb_defragment_fill_factor; - -SET @@global.innodb_defragment_fill_factor = 1; -SELECT @@global.innodb_defragment_fill_factor; - -SET @@global.innodb_defragment_fill_factor = 0.7; -SELECT @@global.innodb_defragment_fill_factor; - -SET @@global.innodb_defragment_fill_factor = -1; -SELECT @@global.innodb_defragment_fill_factor; - -SET @@global.innodb_defragment_fill_factor = 2; -SELECT @@global.innodb_defragment_fill_factor; - ---Error ER_WRONG_TYPE_FOR_VAR -SET @@global.innodb_defragment_fill_factor = "abc"; -SELECT @@global.innodb_defragment_fill_factor; - -SET @@global.innodb_defragment_fill_factor = @start_innodb_defragment_fill_factor; diff --git a/mysql-test/suite/sys_vars/t/innodb_defragment_fill_factor_n_recs_basic.test b/mysql-test/suite/sys_vars/t/innodb_defragment_fill_factor_n_recs_basic.test deleted file mode 100644 index 366817c4..00000000 --- a/mysql-test/suite/sys_vars/t/innodb_defragment_fill_factor_n_recs_basic.test +++ /dev/null @@ -1,31 +0,0 @@ ---source include/have_innodb.inc - -SET @start_innodb_defragment_fill_factor_n_recs = @@global.innodb_defragment_fill_factor_n_recs; -SELECT @start_innodb_defragment_fill_factor_n_recs; - -SELECT COUNT(@@global.innodb_defragment_fill_factor_n_recs); - -SET @@global.innodb_defragment_fill_factor_n_recs = 50; -SELECT @@global.innodb_defragment_fill_factor_n_recs; - -SET @@global.innodb_defragment_fill_factor_n_recs = 100; -SELECT @@global.innodb_defragment_fill_factor_n_recs; - -SET @@global.innodb_defragment_fill_factor_n_recs = 1; -SELECT @@global.innodb_defragment_fill_factor_n_recs; - -SET @@global.innodb_defragment_fill_factor_n_recs = -1; -SELECT @@global.innodb_defragment_fill_factor_n_recs; - -SET @@global.innodb_defragment_fill_factor_n_recs = 10000; -SELECT @@global.innodb_defragment_fill_factor_n_recs; - ---Error ER_WRONG_TYPE_FOR_VAR -SET @@global.innodb_defragment_fill_factor_n_recs = 10.5; -SELECT @@global.innodb_defragment_fill_factor_n_recs; - ---Error ER_WRONG_TYPE_FOR_VAR -SET @@global.innodb_defragment_fill_factor_n_recs = "abc"; -SELECT @@global.innodb_defragment_fill_factor_n_recs; - -SET @@global.innodb_defragment_fill_factor_n_recs = @start_innodb_defragment_fill_factor_n_recs; diff --git a/mysql-test/suite/sys_vars/t/innodb_defragment_frequency_basic.test b/mysql-test/suite/sys_vars/t/innodb_defragment_frequency_basic.test deleted file mode 100644 index 3ab45744..00000000 --- a/mysql-test/suite/sys_vars/t/innodb_defragment_frequency_basic.test +++ /dev/null @@ -1,37 +0,0 @@ ---source include/have_innodb.inc - -SET @start_innodb_defragment_frequency = @@global.innodb_defragment_frequency; -SELECT @start_innodb_defragment_frequency; - -SELECT COUNT(@@global.innodb_defragment_frequency); - -# test valid value -SET @@global.innodb_defragment_frequency = 200; -SELECT @@global.innodb_defragment_frequency; - -# test valid min -SET @@global.innodb_defragment_frequency = 1; -SELECT @@global.innodb_defragment_frequency; - -# test valid max -SET @@global.innodb_defragment_frequency = 1000; -SELECT @@global.innodb_defragment_frequency; - -# test invalid value < min -SET @@global.innodb_defragment_frequency = -1; -SELECT @@global.innodb_defragment_frequency; - -# test invalid value > max -SET @@global.innodb_defragment_frequency = 10000; -SELECT @@global.innodb_defragment_frequency; - -# test wrong type ---Error ER_WRONG_TYPE_FOR_VAR -SET @@global.innodb_defragment_frequency = 10.5; -SELECT @@global.innodb_defragment_frequency; - ---Error ER_WRONG_TYPE_FOR_VAR -SET @@global.innodb_defragment_frequency = "abc"; -SELECT @@global.innodb_defragment_frequency; - -SET @@global.innodb_defragment_frequency = @start_innodb_defragment_frequency; diff --git a/mysql-test/suite/sys_vars/t/innodb_defragment_n_pages_basic.test b/mysql-test/suite/sys_vars/t/innodb_defragment_n_pages_basic.test deleted file mode 100644 index 64aa20a6..00000000 --- a/mysql-test/suite/sys_vars/t/innodb_defragment_n_pages_basic.test +++ /dev/null @@ -1,22 +0,0 @@ ---source include/have_innodb.inc - -SET @start_innodb_defragment_n_pages = @@global.innodb_defragment_n_pages; -SELECT @start_innodb_defragment_n_pages; - -SELECT COUNT(@@global.innodb_defragment_n_pages); - -SET @@global.innodb_defragment_n_pages = 1; -SELECT @@global.innodb_defragment_n_pages; - -SET @@global.innodb_defragment_n_pages = 2; -SELECT @@global.innodb_defragment_n_pages; - -SET @@global.innodb_defragment_n_pages = 32; -SELECT @@global.innodb_defragment_n_pages; - -SET @@global.innodb_defragment_n_pages = 64; -SELECT @@global.innodb_defragment_n_pages; - -SET @@global.innodb_defragment_n_pages = @start_innodb_defragment_n_pages; - - diff --git a/mysql-test/suite/sys_vars/t/innodb_defragment_stats_accuracy_basic.test b/mysql-test/suite/sys_vars/t/innodb_defragment_stats_accuracy_basic.test deleted file mode 100644 index 062753f2..00000000 --- a/mysql-test/suite/sys_vars/t/innodb_defragment_stats_accuracy_basic.test +++ /dev/null @@ -1,24 +0,0 @@ ---source include/have_innodb.inc - -SET @start_innodb_defragment_stats_accuracy = @@global.innodb_defragment_stats_accuracy; -SELECT @start_innodb_defragment_stats_accuracy; - -SELECT COUNT(@@global.innodb_defragment_stats_accuracy); - -SET @@global.innodb_defragment_stats_accuracy = 1; -SELECT @@global.innodb_defragment_stats_accuracy; - -SET @@global.innodb_defragment_stats_accuracy = 1000; -SELECT @@global.innodb_defragment_stats_accuracy; - -SET @@global.innodb_defragment_stats_accuracy = -1; -SELECT @@global.innodb_defragment_stats_accuracy; - -SET @@global.innodb_defragment_stats_accuracy = 1000000000000; -SELECT @@global.innodb_defragment_stats_accuracy; - ---Error ER_WRONG_TYPE_FOR_VAR -SET @@global.innodb_defragment_stats_accuracy = "abc"; -SELECT @@global.innodb_defragment_stats_accuracy; - -SET @@global.innodb_defragment_stats_accuracy = @start_innodb_defragment_stats_accuracy; diff --git a/mysql-test/suite/sys_vars/t/innodb_doublewrite_basic.opt b/mysql-test/suite/sys_vars/t/innodb_doublewrite_basic.opt new file mode 100644 index 00000000..2bea5a22 --- /dev/null +++ b/mysql-test/suite/sys_vars/t/innodb_doublewrite_basic.opt @@ -0,0 +1 @@ +--innodb-doublewrite diff --git a/mysql-test/suite/sys_vars/t/innodb_doublewrite_basic.test b/mysql-test/suite/sys_vars/t/innodb_doublewrite_basic.test index 1ae10d0f..4e76c0ac 100644 --- a/mysql-test/suite/sys_vars/t/innodb_doublewrite_basic.test +++ b/mysql-test/suite/sys_vars/t/innodb_doublewrite_basic.test @@ -1,75 +1,20 @@ - - -################## mysql-test\t\innodb_doublewrite_basic.test ################# -# # -# Variable Name: innodb_doublewrite # -# Scope: Global # -# Access Type: Static # -# Data Type: boolean # -# # -# # -# Creation Date: 2008-02-07 # -# Author : Sharique Abdullah # -# # -# # -# Description:Test Cases of Dynamic System Variable innodb_doublewrite # -# that checks the behavior of this variable in the following ways # -# * Value Check # -# * Scope Check # -# # -# Reference: http://dev.mysql.com/doc/refman/5.1/en/ # -# server-system-variables.html # -# # -############################################################################### - --source include/have_innodb.inc ---echo '#---------------------BS_STVARS_026_01----------------------#' -#################################################################### -# Displaying default value # -#################################################################### -SELECT COUNT(@@GLOBAL.innodb_doublewrite); ---echo 1 Expected - +SELECT @@GLOBAL.innodb_doublewrite; ---echo '#---------------------BS_STVARS_026_02----------------------#' -#################################################################### -# Check if Value can set # -#################################################################### +SET @@GLOBAL.innodb_doublewrite=0; +SELECT @@GLOBAL.innodb_doublewrite; ---error ER_INCORRECT_GLOBAL_LOCAL_VAR +SET @@GLOBAL.innodb_doublewrite=2; +--error ER_WRONG_VALUE_FOR_VAR +SET @@GLOBAL.innodb_doublewrite=3; +SELECT @@GLOBAL.innodb_doublewrite; SET @@GLOBAL.innodb_doublewrite=1; ---echo Expected error 'Read only variable' - -SELECT COUNT(@@GLOBAL.innodb_doublewrite); ---echo 1 Expected - - - - ---echo '#---------------------BS_STVARS_026_03----------------------#' -################################################################# -# Check if the value in GLOBAL Table matches value in variable # -################################################################# - ---disable_warnings -SELECT IF(@@GLOBAL.innodb_doublewrite, "ON", "OFF") = VARIABLE_VALUE -FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES -WHERE VARIABLE_NAME='innodb_doublewrite'; ---enable_warnings ---echo 1 Expected - -SELECT COUNT(@@GLOBAL.innodb_doublewrite); ---echo 1 Expected +SELECT @@GLOBAL.innodb_doublewrite; ---disable_warnings SELECT COUNT(VARIABLE_VALUE) -FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES +FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='innodb_doublewrite'; ---enable_warnings ---echo 1 Expected - - --echo '#---------------------BS_STVARS_026_04----------------------#' ################################################################################ @@ -78,8 +23,6 @@ WHERE VARIABLE_NAME='innodb_doublewrite'; SELECT @@innodb_doublewrite = @@GLOBAL.innodb_doublewrite; --echo 1 Expected - - --echo '#---------------------BS_STVARS_026_05----------------------#' ################################################################################ # Check if innodb_doublewrite can be accessed with and without @@ sign # @@ -99,8 +42,5 @@ SELECT COUNT(@@SESSION.innodb_doublewrite); SELECT COUNT(@@GLOBAL.innodb_doublewrite); --echo 1 Expected ---Error ER_BAD_FIELD_ERROR -SELECT innodb_doublewrite = @@SESSION.innodb_doublewrite; ---echo Expected error 'Readonly variable' - - +--error ER_INCORRECT_GLOBAL_LOCAL_VAR +SELECT @@innodb_doublewrite = @@SESSION.innodb_doublewrite; diff --git a/mysql-test/suite/sys_vars/t/lc_time_names_basic.test b/mysql-test/suite/sys_vars/t/lc_time_names_basic.test index 7e634eda..ff676a6d 100644 --- a/mysql-test/suite/sys_vars/t/lc_time_names_basic.test +++ b/mysql-test/suite/sys_vars/t/lc_time_names_basic.test @@ -315,8 +315,6 @@ SET @@session.lc_time_names=sl_SI; SELECT @@session.lc_time_names; SET @@session.lc_time_names=sq_AL; SELECT @@session.lc_time_names; -SET @@session.lc_time_names=sr_YU; -SELECT @@session.lc_time_names; SET @@session.lc_time_names=sv_FI; SELECT @@session.lc_time_names; SET @@session.lc_time_names=sr_RS; @@ -548,8 +546,6 @@ SET @@global.lc_time_names=sl_SI; SELECT @@global.lc_time_names; SET @@global.lc_time_names=sq_AL; SELECT @@global.lc_time_names; -SET @@global.lc_time_names=sr_YU; -SELECT @@global.lc_time_names; SET @@global.lc_time_names=sv_FI; SELECT @@global.lc_time_names; SET @@global.lc_time_names=sr_RS; @@ -623,8 +619,10 @@ SET @@lc_time_names = 110; SELECT @@lc_time_names; SET @@lc_time_names = 111; SELECT @@lc_time_names; ---Error ER_UNKNOWN_LOCALE SET @@lc_time_names = 112; +SELECT @@lc_time_names; +--Error ER_UNKNOWN_LOCALE +SET @@lc_time_names = 113; --echo '#--------------------FN_DYNVARS_060_10-------------------------#' ############################################################################# @@ -643,6 +641,8 @@ SET @@lc_time_names = -1; SET @@lc_time_names = 'en US'; --Error ER_UNKNOWN_LOCALE SET @@lc_time_names = 'enUS'; +--Error ER_UNKNOWN_LOCALE +SET @@session.lc_time_names=sr_YU; SET @@lc_time_names = true; SELECT @@lc_time_names AS res_with_true; diff --git a/mysql-test/suite/sys_vars/t/max_binlog_total_size_basic.test b/mysql-test/suite/sys_vars/t/max_binlog_total_size_basic.test new file mode 100644 index 00000000..6463a8fa --- /dev/null +++ b/mysql-test/suite/sys_vars/t/max_binlog_total_size_basic.test @@ -0,0 +1,42 @@ +# We cannot use embedded server here as access right checking will not work +--source include/not_embedded.inc +# +# only global +# +select @@global.max_binlog_total_size; +--error ER_INCORRECT_GLOBAL_LOCAL_VAR +select @@session.max_binlog_total_size; +show global variables like 'max_binlog_total_size'; +show session variables like 'max_binlog_total_size'; +--disable_warnings +select * from information_schema.global_variables where variable_name='max_binlog_total_size'; +select * from information_schema.session_variables where variable_name='max_binlog_total_size'; +--enable_warnings + +# +# show that it is not read-only +# +set global max_binlog_total_size=1; +select @@global.max_binlog_total_size, @@global.binlog_space_limit; +set global max_binlog_total_size=1; +select @@global.max_binlog_total_size; +set global binlog_space_limit=2; +select @@global.max_binlog_total_size, @@global.binlog_space_limit; + +--error ER_GLOBAL_VARIABLE +set session max_binlog_total_size=1; + +set global max_binlog_total_size=default; + +# +# Check permissions +# +CREATE USER user1@localhost; +connect (con2,localhost,user1,,); +--error ER_SPECIFIC_ACCESS_DENIED_ERROR +set global max_binlog_total_size=1; +--error ER_SPECIFIC_ACCESS_DENIED_ERROR +set global binlog_space_limit=1; +disconnect con2; +connection default; +DROP USER user1@localhost; diff --git a/mysql-test/suite/sys_vars/t/max_connect_errors_grant.test b/mysql-test/suite/sys_vars/t/max_connect_errors_grant.test index d349d938..589be656 100644 --- a/mysql-test/suite/sys_vars/t/max_connect_errors_grant.test +++ b/mysql-test/suite/sys_vars/t/max_connect_errors_grant.test @@ -6,11 +6,11 @@ SET @global=@@global.max_connect_errors; --echo # MDEV-21961 Bind CONNECTION ADMIN to a number of global system variables --echo # ---echo # Test that "SET max_connect_errors" is not allowed without CONNECTION ADMIN or SUPER +--echo # 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 --error ER_SPECIFIC_ACCESS_DENIED_ERROR @@ -38,19 +38,4 @@ SET SESSION max_connect_errors=10; --connection default DROP USER user1@localhost; ---echo # 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; ---error ER_GLOBAL_VARIABLE -SET max_connect_errors=10; ---error ER_GLOBAL_VARIABLE -SET SESSION max_connect_errors=10; ---disconnect user1 ---connection default -DROP USER user1@localhost; - SET @@global.max_connect_errors=@global; diff --git a/mysql-test/suite/sys_vars/t/max_connections_grant.test b/mysql-test/suite/sys_vars/t/max_connections_grant.test index d51bd08e..1364e526 100644 --- a/mysql-test/suite/sys_vars/t/max_connections_grant.test +++ b/mysql-test/suite/sys_vars/t/max_connections_grant.test @@ -6,11 +6,11 @@ SET @global=@@global.max_connections; --echo # MDEV-21961 Bind CONNECTION ADMIN to a number of global system variables --echo # ---echo # Test that "SET max_connections" is not allowed without CONNECTION ADMIN or SUPER +--echo # 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 --error ER_SPECIFIC_ACCESS_DENIED_ERROR @@ -38,19 +38,4 @@ SET SESSION max_connections=10; --connection default DROP USER user1@localhost; ---echo # 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; ---error ER_GLOBAL_VARIABLE -SET max_connections=10; ---error ER_GLOBAL_VARIABLE -SET SESSION max_connections=10; ---disconnect user1 ---connection default -DROP USER user1@localhost; - SET @@global.max_connections=@global; diff --git a/mysql-test/suite/sys_vars/t/max_join_size_basic.test b/mysql-test/suite/sys_vars/t/max_join_size_basic.test index bbe13457..1741857d 100644 --- a/mysql-test/suite/sys_vars/t/max_join_size_basic.test +++ b/mysql-test/suite/sys_vars/t/max_join_size_basic.test @@ -23,7 +23,7 @@ select * from information_schema.session_variables where variable_name='max_join # show that it's writable # set global max_join_size=10; -set session max_join_size=20; +set session max_join_size=100; select @@global.max_join_size; select @@session.max_join_size; show global variables like 'max_join_size'; diff --git a/mysql-test/suite/sys_vars/t/max_join_size_func.test b/mysql-test/suite/sys_vars/t/max_join_size_func.test index c649c036..5fc8ee58 100644 --- a/mysql-test/suite/sys_vars/t/max_join_size_func.test +++ b/mysql-test/suite/sys_vars/t/max_join_size_func.test @@ -84,7 +84,7 @@ connect (test_con1, localhost, root,,); connection test_con1; --echo ## Setting value of max_join_size ## -SET @@session.max_join_size=8; +SET @@session.max_join_size=4; --echo ## Since total joins are more than max_join_size value so error will occur ## --Error ER_TOO_BIG_SELECT @@ -97,7 +97,7 @@ SELECT * FROM t1 INNER JOIN t2 ON t1.id = t2.id; ########################################################## --echo ## 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; diff --git a/mysql-test/suite/sys_vars/t/max_password_errors_grant.test b/mysql-test/suite/sys_vars/t/max_password_errors_grant.test index f11c1fb8..c8b9e998 100644 --- a/mysql-test/suite/sys_vars/t/max_password_errors_grant.test +++ b/mysql-test/suite/sys_vars/t/max_password_errors_grant.test @@ -6,11 +6,11 @@ SET @global=@@global.max_password_errors; --echo # MDEV-21961 Bind CONNECTION ADMIN to a number of global system variables --echo # ---echo # Test that "SET max_password_errors" is not allowed without CONNECTION ADMIN or SUPER +--echo # 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 --error ER_SPECIFIC_ACCESS_DENIED_ERROR @@ -38,19 +38,4 @@ SET SESSION max_password_errors=10; --connection default DROP USER user1@localhost; ---echo # 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; ---error ER_GLOBAL_VARIABLE -SET max_password_errors=10; ---error ER_GLOBAL_VARIABLE -SET SESSION max_password_errors=10; ---disconnect user1 ---connection default -DROP USER user1@localhost; - SET @@global.max_password_errors=@global; diff --git a/mysql-test/suite/sys_vars/t/max_tmp_tables_basic.test b/mysql-test/suite/sys_vars/t/max_tmp_tables_basic.test deleted file mode 100644 index 236c5983..00000000 --- a/mysql-test/suite/sys_vars/t/max_tmp_tables_basic.test +++ /dev/null @@ -1,227 +0,0 @@ -############## mysql-test\t\max_tmp_tables_basic.test ############### -# # -# Variable Name: max_tmp_tables # -# Scope: GLOBAL | SESSION # -# Access Type: Dynamic # -# Data Type: numeric # -# Default Value: 32 # -# Range: 1-4294967295 # -# # -# # -# # -# # -# # -# Creation Date: 2008-02-07 # -# Author: Salman # -# # -# Description: Test Cases of Dynamic System Variable max_tmp_tables # -# that checks the behavior of this variable in the following ways# -# * Default Value # -# * Valid & Invalid values # -# * Scope & Access method # -# * Data Integrity # -# # -# Reference: http://dev.mysql.com/doc/refman/5.1/en/ # -# server-system-variables.html # -# # -############################################################################### - ---source include/load_sysvars.inc - -#################################### -# START OF max_tmp_tables TESTS # -#################################### - - -############################################################# -# Save initial value # -############################################################# - -SET @start_global_value = @@global.max_tmp_tables; -SELECT @start_global_value; -SET @start_session_value = @@session.max_tmp_tables; -SELECT @start_session_value; - - ---echo '#--------------------FN_DYNVARS_086_01-------------------------#' -###################################################### -# Display the DEFAULT value of max_tmp_tables # -###################################################### - -SET @@global.max_tmp_tables = 1000; -SET @@global.max_tmp_tables = DEFAULT; -SELECT @@global.max_tmp_tables; - - -SET @@session.max_tmp_tables = 1000; -SET @@session.max_tmp_tables = DEFAULT; -SELECT @@session.max_tmp_tables; - - ---echo '#--------------------FN_DYNVARS_086_02-------------------------#' -###################################################### -# Check the DEFAULT value of max_tmp_tables # -###################################################### - -SET @@global.max_tmp_tables = DEFAULT; -SELECT @@global.max_tmp_tables = 32; - -SET @@session.max_tmp_tables = DEFAULT; -SELECT @@session.max_tmp_tables = 32; - - - ---echo '#--------------------FN_DYNVARS_086_03-------------------------#' -######################################################################## -# Change the value of max_tmp_tables to a valid value for GLOBAL Scope # -######################################################################## - -SET @@global.max_tmp_tables = 1; -SELECT @@global.max_tmp_tables; -SET @@global.max_tmp_tables = 2; -SELECT @@global.max_tmp_tables; -SET @@global.max_tmp_tables = 65536; -SELECT @@global.max_tmp_tables; -SET @@global.max_tmp_tables = 4294967295; -SELECT @@global.max_tmp_tables; -SET @@global.max_tmp_tables = 4294967294; -SELECT @@global.max_tmp_tables; - ---echo '#--------------------FN_DYNVARS_086_04-------------------------#' -######################################################################### -# Change the value of max_tmp_tables to a valid value for SESSION Scope # -######################################################################### - -SET @@session.max_tmp_tables = 1; -SELECT @@session.max_tmp_tables; - -SET @@session.max_tmp_tables = 2; -SELECT @@session.max_tmp_tables; - -SET @@session.max_tmp_tables = 65536; -SELECT @@session.max_tmp_tables; - -SET @@session.max_tmp_tables = 4294967295; -SELECT @@session.max_tmp_tables; - -SET @@session.max_tmp_tables = 4294967294; -SELECT @@session.max_tmp_tables; - - ---echo '#------------------FN_DYNVARS_086_05-----------------------#' -########################################################## -# Change the value of max_tmp_tables to an invalid value # -########################################################## - -SET @@global.max_tmp_tables = -1024; -SELECT @@global.max_tmp_tables; -SET @@global.max_tmp_tables = 4294967296; -SELECT @@global.max_tmp_tables; -SET @@global.max_tmp_tables = -1; -SELECT @@global.max_tmp_tables; -SET @@global.max_tmp_tables = 429496729500; -SELECT @@global.max_tmp_tables; ---Error ER_WRONG_TYPE_FOR_VAR -SET @@global.max_tmp_tables = 65530.34; -SELECT @@global.max_tmp_tables; ---Error ER_WRONG_TYPE_FOR_VAR -SET @@global.max_tmp_tables = test; -SELECT @@global.max_tmp_tables; - -SET @@session.max_tmp_tables = 4294967296; -SELECT @@session.max_tmp_tables; -SET @@session.max_tmp_tables = -1; -SELECT @@session.max_tmp_tables; -SET @@session.max_tmp_tables = 429496729500; -SELECT @@session.max_tmp_tables; -SET @@session.max_tmp_tables = -001; -SELECT @@session.max_tmp_tables; ---Error ER_WRONG_TYPE_FOR_VAR -SET @@session.max_tmp_tables = 65530.34; -SET @@session.max_tmp_tables = 10737418241; -SELECT @@session.max_tmp_tables; ---Error ER_WRONG_TYPE_FOR_VAR -SET @@session.max_tmp_tables = test; -SELECT @@session.max_tmp_tables; - - ---echo '#------------------FN_DYNVARS_086_06-----------------------#' -#################################################################### -# Check if the value in GLOBAL Table matches value in variable # -#################################################################### - - -SELECT @@global.max_tmp_tables = VARIABLE_VALUE -FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES -WHERE VARIABLE_NAME='max_tmp_tables'; - ---echo '#------------------FN_DYNVARS_086_07-----------------------#' -#################################################################### -# Check if the value in SESSION Table matches value in variable # -#################################################################### - -SELECT @@session.max_tmp_tables = VARIABLE_VALUE -FROM INFORMATION_SCHEMA.SESSION_VARIABLES -WHERE VARIABLE_NAME='max_tmp_tables'; - - ---echo '#------------------FN_DYNVARS_086_08-----------------------#' -#################################################################### -# Check if TRUE and FALSE values can be used on variable # -#################################################################### - -SET @@global.max_tmp_tables = TRUE; -SELECT @@global.max_tmp_tables; -SET @@global.max_tmp_tables = FALSE; -SELECT @@global.max_tmp_tables; - - ---echo '#---------------------FN_DYNVARS_086_09----------------------#' -################################################################################# -# Check if accessing variable with and without GLOBAL point to same variable # -################################################################################# - -SET @@global.max_tmp_tables = 20; -SELECT @@max_tmp_tables = @@global.max_tmp_tables; - - ---echo '#---------------------FN_DYNVARS_086_10----------------------#' -######################################################################################################## -# Check if accessing variable with SESSION,LOCAL and without SCOPE points to same session variable # -######################################################################################################## - -SET @@max_tmp_tables = 255; -SELECT @@max_tmp_tables = @@local.max_tmp_tables; -SELECT @@local.max_tmp_tables = @@session.max_tmp_tables; - - ---echo '#---------------------FN_DYNVARS_086_11----------------------#' -######################################################################### -# Check if max_tmp_tables can be accessed with and without @@ sign # -######################################################################### - - -SET max_tmp_tables = 102; -SELECT @@max_tmp_tables; ---Error ER_UNKNOWN_TABLE -SELECT local.max_tmp_tables; ---Error ER_UNKNOWN_TABLE -SELECT session.max_tmp_tables; ---Error ER_BAD_FIELD_ERROR -SELECT max_tmp_tables = @@session.max_tmp_tables; - - -#################################### -# Restore initial value # -#################################### - -SET @@global.max_tmp_tables = @start_global_value; -SELECT @@global.max_tmp_tables; -SET @@session.max_tmp_tables = @start_session_value; -SELECT @@session.max_tmp_tables; - - -################################################### -# END OF max_tmp_tables TESTS # -################################################### - diff --git a/mysql-test/suite/sys_vars/t/mdev_15935.test b/mysql-test/suite/sys_vars/t/mdev_15935.test new file mode 100644 index 00000000..856a97e8 --- /dev/null +++ b/mysql-test/suite/sys_vars/t/mdev_15935.test @@ -0,0 +1,13 @@ +--echo # +--echo # test cleanup of sys_var classes +--echo # + +--let $long_string=`select repeat('.', 2001)` +--error ER_WRONG_STRING_LENGTH +eval set global init_connect="$long_string"; +--error ER_WRONG_STRING_LENGTH +eval set global ft_boolean_syntax="$long_string"; + +--echo # +--echo # end of test mdev_15935 +--echo # diff --git a/mysql-test/suite/sys_vars/t/mdev_32254.test b/mysql-test/suite/sys_vars/t/mdev_32254.test new file mode 100644 index 00000000..d907806f --- /dev/null +++ b/mysql-test/suite/sys_vars/t/mdev_32254.test @@ -0,0 +1,17 @@ +--echo # +--echo # MDEV-32254 Server crashes when adding records to table after setting redirect_url with empty variable +--echo # +--source include/have_innodb.inc +# redirect_url is undefined in embedded. +--source include/not_embedded.inc +set @old_redirect_url=@@global.redirect_url; +--error ER_WRONG_VALUE_FOR_VAR +set global redirect_url=@empty_value; +CREATE TABLE t (c1 INT) ENGINE=INNODB; +INSERT INTO t VALUES (1),(1); +drop table t; +set global redirect_url=@old_redirect_url; + +--echo # +--echo # end of test mdev_32254 +--echo # diff --git a/mysql-test/suite/sys_vars/t/mdev_32525.test b/mysql-test/suite/sys_vars/t/mdev_32525.test new file mode 100644 index 00000000..151c7e8d --- /dev/null +++ b/mysql-test/suite/sys_vars/t/mdev_32525.test @@ -0,0 +1,23 @@ +--echo # +--echo # MDEV-32525 Server startup fails to validate invalid redirect_url +--echo # +--source include/not_embedded.inc + +let $error_log= $MYSQLTEST_VARDIR/log/mdev_32525.err; +let SEARCH_FILE= $error_log; +--source include/shutdown_mysqld.inc +# Server start should fail with an invalid --redirect_url +--error 1 +--exec $MYSQLD_LAST_CMD --redirect_url="mariadbaaa://test" > $error_log 2>&1 +let SEARCH_PATTERN= \[ERROR\].*Invalid redirect_url: mariadbaaa://test; +--source include/search_pattern_in_file.inc + +# Test empty --redirect_url to avoid similar problems as in +# MDEV-32254. +--let restart_parameter=--redirect_url= +--source include/start_mysqld.inc +select @@redirect_url; + +--echo # +--echo # end of test mdev_32525 +--echo # diff --git a/mysql-test/suite/sys_vars/t/mdev_32640.test b/mysql-test/suite/sys_vars/t/mdev_32640.test new file mode 100644 index 00000000..693bb1e9 --- /dev/null +++ b/mysql-test/suite/sys_vars/t/mdev_32640.test @@ -0,0 +1,18 @@ +--source include/not_embedded.inc + +PREPARE s_1 FROM 'SHOW RELAYLOG EVENTS'; +/* 1 */ SET default_master_connection='MASTER'; +--error WARN_NO_MASTER_INFO +/* 1 */ EXECUTE s_1; +/* 2 */ SET default_master_connection='MASTER'; +--error WARN_NO_MASTER_INFO +/* 2 */ EXECUTE s_1; + +create procedure p() SHOW RELAYLOG EVENTS; +/* 1 */ SET default_master_connection='MASTER'; +--error WARN_NO_MASTER_INFO +/* 1 */ call p; +/* 2 */ SET default_master_connection='MASTER'; +--error WARN_NO_MASTER_INFO +/* 2 */ call p; +drop procedure p; diff --git a/mysql-test/suite/sys_vars/t/old_alter_table_basic.test b/mysql-test/suite/sys_vars/t/old_alter_table_basic.test deleted file mode 100644 index 9a6cb477..00000000 --- a/mysql-test/suite/sys_vars/t/old_alter_table_basic.test +++ /dev/null @@ -1,68 +0,0 @@ - -# -# 2010-01-20 OBN - added check of I_S values after variable value changed -# - -SET @start_global_value = @@global.old_alter_table; -SELECT @start_global_value; - -# -# exists as global and session -# -select @@global.old_alter_table; -select @@session.old_alter_table; -show global variables like 'old_alter_table'; -show session variables like 'old_alter_table'; -select * from information_schema.global_variables where variable_name='old_alter_table'; -select * from information_schema.session_variables where variable_name='old_alter_table'; - -# -# show that it's writable -# -set global old_alter_table=1; -set session old_alter_table=1; -select @@global.old_alter_table; -select @@session.old_alter_table; -show global variables like 'old_alter_table'; -show session variables like 'old_alter_table'; -select * from information_schema.global_variables where variable_name='old_alter_table'; -select * from information_schema.session_variables where variable_name='old_alter_table'; - -set global old_alter_table=2; -set session old_alter_table=2; -select @@global.old_alter_table; -select @@session.old_alter_table; -show global variables like 'old_alter_table'; -show session variables like 'old_alter_table'; -select * from information_schema.global_variables where variable_name='old_alter_table'; -select * from information_schema.session_variables where variable_name='old_alter_table'; - -set global old_alter_table=3; -set session old_alter_table=3; -select @@global.old_alter_table; -select @@session.old_alter_table; -show global variables like 'old_alter_table'; -show session variables like 'old_alter_table'; -select * from information_schema.global_variables where variable_name='old_alter_table'; -select * from information_schema.session_variables where variable_name='old_alter_table'; - -set global old_alter_table=4; -set session old_alter_table=4; -select @@global.old_alter_table; -select @@session.old_alter_table; -show global variables like 'old_alter_table'; -show session variables like 'old_alter_table'; -select * from information_schema.global_variables where variable_name='old_alter_table'; -select * from information_schema.session_variables where variable_name='old_alter_table'; -# -# incorrect types -# ---error ER_WRONG_TYPE_FOR_VAR -set global old_alter_table=1.1; ---error ER_WRONG_TYPE_FOR_VAR -set global old_alter_table=1e1; ---error ER_WRONG_VALUE_FOR_VAR -set global old_alter_table="foo"; - -SET @@global.old_alter_table = @start_global_value; -SELECT @@global.old_alter_table; diff --git a/mysql-test/suite/sys_vars/t/old_mode_basic.test b/mysql-test/suite/sys_vars/t/old_mode_basic.test index cb187967..c3fc4c57 100644 --- a/mysql-test/suite/sys_vars/t/old_mode_basic.test +++ b/mysql-test/suite/sys_vars/t/old_mode_basic.test @@ -172,7 +172,7 @@ SET @@global.old_mode = 4; SELECT @@global.old_mode; --Error ER_WRONG_VALUE_FOR_VAR -SET @@global.old_mode = 128; +SET @@global.old_mode = 256; SELECT @@global.old_mode; # use of decimal values diff --git a/mysql-test/suite/sys_vars/t/old_passwords_func.test b/mysql-test/suite/sys_vars/t/old_passwords_func.test index bf1d7dcc..842d25e2 100644 --- a/mysql-test/suite/sys_vars/t/old_passwords_func.test +++ b/mysql-test/suite/sys_vars/t/old_passwords_func.test @@ -61,7 +61,11 @@ connect (con2,localhost,userNewPass2,pass2,); SELECT CURRENT_USER(); --echo userNewPass2@localhost Expected -connect (con3,localhost,userOldPass,pass3,); +--replace_result $MASTER_MYSOCK MASTER_MYSOCK $MASTER_MYPORT MASTER_MYPORT +--error 5010 +connect con3,localhost,userOldPass,pass3; +connect con3,localhost,userOldPass,pass3,,,,auth=mysql_old_password:mysql_native_password; + SELECT CURRENT_USER(); --echo userOldPass@localhost Expected diff --git a/mysql-test/suite/sys_vars/t/optimizer_switch_basic.test b/mysql-test/suite/sys_vars/t/optimizer_switch_basic.test index ada22845..a5162075 100644 --- a/mysql-test/suite/sys_vars/t/optimizer_switch_basic.test +++ b/mysql-test/suite/sys_vars/t/optimizer_switch_basic.test @@ -19,8 +19,8 @@ select * from information_schema.session_variables where variable_name='optimize # # show that it's writable # -set global optimizer_switch=4101; -set session optimizer_switch=2058; +set global optimizer_switch=2053; +set session optimizer_switch=1034; select @@global.optimizer_switch; select @@session.optimizer_switch; set global optimizer_switch="index_merge_sort_union=on"; diff --git a/mysql-test/suite/sys_vars/t/proxy_protocol_networks_grant.test b/mysql-test/suite/sys_vars/t/proxy_protocol_networks_grant.test index f2dd8158..85538755 100644 --- a/mysql-test/suite/sys_vars/t/proxy_protocol_networks_grant.test +++ b/mysql-test/suite/sys_vars/t/proxy_protocol_networks_grant.test @@ -6,11 +6,11 @@ SET @global=@@global.proxy_protocol_networks; --echo # MDEV-21961 Bind CONNECTION ADMIN to a number of global system variables --echo # ---echo # Test that "SET proxy_protocol_networks" is not allowed without CONNECTION ADMIN or SUPER +--echo # 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 --error ER_SPECIFIC_ACCESS_DENIED_ERROR @@ -38,19 +38,4 @@ SET SESSION proxy_protocol_networks=""; --connection default DROP USER user1@localhost; ---echo # 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=""; ---error ER_GLOBAL_VARIABLE -SET proxy_protocol_networks=""; ---error ER_GLOBAL_VARIABLE -SET SESSION proxy_protocol_networks=""; ---disconnect user1 ---connection default -DROP USER user1@localhost; - SET @@global.proxy_protocol_networks=@global; diff --git a/mysql-test/suite/sys_vars/t/redirect.opt b/mysql-test/suite/sys_vars/t/redirect.opt new file mode 100644 index 00000000..4cf52749 --- /dev/null +++ b/mysql-test/suite/sys_vars/t/redirect.opt @@ -0,0 +1 @@ +--init-connect="set redirect_url='mysql://foobar'" diff --git a/mysql-test/suite/sys_vars/t/redirect.test b/mysql-test/suite/sys_vars/t/redirect.test new file mode 100644 index 00000000..5a0cb442 --- /dev/null +++ b/mysql-test/suite/sys_vars/t/redirect.test @@ -0,0 +1,74 @@ +--echo # +--echo # MDEV-15935 Connection Redirection Mechanism in MariaDB Client/Server Protocol +--echo # +# redirect_url is undefined in embedded. +--source include/not_embedded.inc + +# We need to connect as a non super user for the init-connect to take +# effect +--source include/add_anonymous_users.inc +connect (con,localhost,anyone_but_root); +select @@redirect_url; + +connection default; +--source include/delete_anonymous_users.inc +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; +set global redirect_url=default; +select @@global.redirect_url; +--error ER_WRONG_VALUE_FOR_VAR +set global redirect_url="mariadb.org"; +--error ER_WRONG_VALUE_FOR_VAR +set global redirect_url="https://mariadb.org"; + +--error ER_WRONG_VALUE_FOR_VAR +set global redirect_url="mysql://mariadb.org:"; +--error ER_WRONG_VALUE_FOR_VAR +set global redirect_url="mysql://mariadb.org:hello"; +--error ER_WRONG_VALUE_FOR_VAR +set global redirect_url="mysql://"; +set global redirect_url="mysql://mariadb.org"; +select @@global.redirect_url; +--error ER_WRONG_VALUE_FOR_VAR +set global redirect_url="mysql://mariadb.org:12a"; +--error ER_WRONG_VALUE_FOR_VAR +set global redirect_url="mysql://mariadb.org:66666"; +set global redirect_url="mysql://mariadb.org:12345"; +select @@global.redirect_url; + +--error ER_WRONG_VALUE_FOR_VAR +set global redirect_url="maria"; +--error ER_WRONG_VALUE_FOR_VAR +set global redirect_url="mariadb://mariadb.org:"; +--error ER_WRONG_VALUE_FOR_VAR +set global redirect_url="mariadb://mariadb.org:hello"; +--error ER_WRONG_VALUE_FOR_VAR +set global redirect_url="mariadb://"; +set global redirect_url="mariadb://mariadb.org"; +select @@global.redirect_url; +--error ER_WRONG_VALUE_FOR_VAR +set global redirect_url="mariadb://mariadb.org:12a"; +--error ER_WRONG_VALUE_FOR_VAR +set global redirect_url="mariadb://mariadb.org:66666"; +set global redirect_url="mariadb://mariadb.org:12345"; +select @@global.redirect_url; + +select @@session.redirect_url; +# Test that session default is global value +set session redirect_url=default; +select @@session.redirect_url; +set session redirect_url="mysql://localhost"; +select @@session.redirect_url; +select @@global.redirect_url; + +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; + +--echo # +--echo # end of test MDEV-15935 +--echo # diff --git a/mysql-test/suite/sys_vars/t/secure_auth_func.test b/mysql-test/suite/sys_vars/t/secure_auth_func.test index 905164ba..6f4043cc 100644 --- a/mysql-test/suite/sys_vars/t/secure_auth_func.test +++ b/mysql-test/suite/sys_vars/t/secure_auth_func.test @@ -65,7 +65,8 @@ 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; diff --git a/mysql-test/suite/sys_vars/t/secure_auth_grant.test b/mysql-test/suite/sys_vars/t/secure_auth_grant.test index f597ec79..3cec03a2 100644 --- a/mysql-test/suite/sys_vars/t/secure_auth_grant.test +++ b/mysql-test/suite/sys_vars/t/secure_auth_grant.test @@ -6,11 +6,11 @@ SET @global=@@global.secure_auth; --echo # MDEV-21961 Bind CONNECTION ADMIN to a number of global system variables --echo # ---echo # Test that "SET secure_auth" is not allowed without CONNECTION ADMIN or SUPER +--echo # 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 --error ER_SPECIFIC_ACCESS_DENIED_ERROR @@ -38,19 +38,4 @@ SET SESSION secure_auth=1; --connection default DROP USER user1@localhost; ---echo # 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; ---error ER_GLOBAL_VARIABLE -SET secure_auth=1; ---error ER_GLOBAL_VARIABLE -SET SESSION secure_auth=1; ---disconnect user1 ---connection default -DROP USER user1@localhost; - SET @@global.secure_auth=@global; diff --git a/mysql-test/suite/sys_vars/t/slave_parallel_threads_basic.cnf b/mysql-test/suite/sys_vars/t/slave_parallel_threads_basic.cnf index 02bdb44e..08af82e1 100644 --- a/mysql-test/suite/sys_vars/t/slave_parallel_threads_basic.cnf +++ b/mysql-test/suite/sys_vars/t/slave_parallel_threads_basic.cnf @@ -1,5 +1,5 @@ # Use default setting for mysqld processes -!include include/default_mysqld.cnf +!include include/default_my.cnf [mysqld.1] slave_parallel_threads=20 diff --git a/mysql-test/suite/sys_vars/t/slow_launch_time_grant.test b/mysql-test/suite/sys_vars/t/slow_launch_time_grant.test index 1a819305..de0ded83 100644 --- a/mysql-test/suite/sys_vars/t/slow_launch_time_grant.test +++ b/mysql-test/suite/sys_vars/t/slow_launch_time_grant.test @@ -6,11 +6,11 @@ SET @global=@@global.slow_launch_time; --echo # MDEV-21961 Bind CONNECTION ADMIN to a number of global system variables --echo # ---echo # Test that "SET slow_launch_time" is not allowed without CONNECTION ADMIN or SUPER +--echo # 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 --error ER_SPECIFIC_ACCESS_DENIED_ERROR @@ -38,19 +38,4 @@ SET SESSION slow_launch_time=10; --connection default DROP USER user1@localhost; ---echo # 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; ---error ER_GLOBAL_VARIABLE -SET slow_launch_time=10; ---error ER_GLOBAL_VARIABLE -SET SESSION slow_launch_time=10; ---disconnect user1 ---connection default -DROP USER user1@localhost; - SET @@global.slow_launch_time=@global; diff --git a/mysql-test/suite/sys_vars/t/sql_big_selects_func.test b/mysql-test/suite/sys_vars/t/sql_big_selects_func.test index 59d81848..b8ff7c53 100644 --- a/mysql-test/suite/sys_vars/t/sql_big_selects_func.test +++ b/mysql-test/suite/sys_vars/t/sql_big_selects_func.test @@ -28,7 +28,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 tables @@ -115,8 +115,6 @@ disconnect con_int2; # # Cleanup # - - 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; diff --git a/mysql-test/suite/sys_vars/t/sql_log_bin_grant.test b/mysql-test/suite/sys_vars/t/sql_log_bin_grant.test index d7ffc2b6..fa0baefa 100644 --- a/mysql-test/suite/sys_vars/t/sql_log_bin_grant.test +++ b/mysql-test/suite/sys_vars/t/sql_log_bin_grant.test @@ -1,15 +1,14 @@ source include/have_log_bin.inc; - --echo # --echo # --echo # ---echo # Test that "SET sql_log_bin" is not allowed without BINLOG ADMIN or SUPER +--echo # 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 --error ER_SPECIFIC_ACCESS_DENIED_ERROR @@ -35,17 +34,3 @@ SET SESSION sql_log_bin=1; --disconnect user1 --connection default DROP USER user1@localhost; - ---echo # 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; ---error ER_INCORRECT_GLOBAL_LOCAL_VAR -SET GLOBAL sql_log_bin=1; -SET SESSION sql_log_bin=1; ---disconnect user1 ---connection default -DROP USER user1@localhost; diff --git a/mysql-test/suite/sys_vars/t/sql_notes_basic.test b/mysql-test/suite/sys_vars/t/sql_notes_basic.test deleted file mode 100644 index 9af5fa35..00000000 --- a/mysql-test/suite/sys_vars/t/sql_notes_basic.test +++ /dev/null @@ -1,171 +0,0 @@ -################### mysql-test\t\sql_notes_basic.test ######################### -# # -# Variable Name: sql_notes # -# Scope: SESSION # -# Access Type: Dynamic # -# Data Type: boolean # -# Default Value: # -# Valid Values: 0,1 # -# # -# # -# Creation Date: 2008-02-07 # -# Author: Rizwan # -# # -# Description: Test Cases of Dynamic System Variable sql_notes # -# that checks the behavior of this variable in the following ways# -# * Default Value # -# * Valid & Invalid values # -# * Scope & Access method # -# * Data Integrity # -# # -# Reference: http://dev.mysql.com/doc/refman/5.1/en/ # -# server-system-variables.html # -# # -############################################################################### - ---source include/load_sysvars.inc - -######################################################################## -# START OF sql_notes TESTS # -######################################################################## - - -############################################################################## -# Saving initial value of sql_notes in a temporary variable # -############################################################################## - -SET @session_start_value = @@session.sql_notes; -SELECT @session_start_value; - - ---echo '#--------------------FN_DYNVARS_161_01------------------------#' -###################################################################### -# Display the DEFAULT value of sql_notes # -###################################################################### - -SET @@session.sql_notes = 0; -SET @@session.sql_notes = DEFAULT; -SELECT @@session.sql_notes; - -SET @@session.sql_notes = 1; -SET @@session.sql_notes = DEFAULT; -SELECT @@session.sql_notes; - - ---echo '#---------------------FN_DYNVARS_161_02-------------------------#' -########################################################################### -# Check if sql_notes can be accessed with and without @@ sign # -########################################################################### - -SET sql_notes = 1; -SELECT @@sql_notes; - ---Error ER_UNKNOWN_TABLE -SELECT session.sql_notes; - ---Error ER_UNKNOWN_TABLE -SELECT local.sql_notes; - -SET session sql_notes = 0; -SELECT @@session.sql_notes; - - ---echo '#--------------------FN_DYNVARS_161_03------------------------#' -###################################################################### -# change the value of sql_notes to a valid value # -###################################################################### - -SET @@session.sql_notes = 0; -SELECT @@session.sql_notes; -SET @@session.sql_notes = 1; -SELECT @@session.sql_notes; - - ---echo '#--------------------FN_DYNVARS_161_04-------------------------#' -######################################################################### -# Change the value of sql_notes to invalid value # -######################################################################### - ---Error ER_WRONG_VALUE_FOR_VAR -SET @@session.sql_notes = -1; ---Error ER_WRONG_VALUE_FOR_VAR -SET @@session.sql_notes = 2; ---Error ER_WRONG_VALUE_FOR_VAR -SET @@session.sql_notes = "T"; ---Error ER_WRONG_VALUE_FOR_VAR -SET @@session.sql_notes = "Y"; ---Error ER_WRONG_VALUE_FOR_VAR -SET @@session.sql_notes = TRÜE; ---Error ER_WRONG_VALUE_FOR_VAR -SET @@session.sql_notes = ÕN; ---Error ER_WRONG_VALUE_FOR_VAR -SET @@session.sql_notes = OF; ---Error ER_WRONG_VALUE_FOR_VAR -SET @@session.sql_notes = ÓFF; ---Error ER_WRONG_VALUE_FOR_VAR -SET @@session.sql_notes = '¹'; ---Error ER_WRONG_VALUE_FOR_VAR -SET @@session.sql_notes = NO; - - ---echo '#-------------------FN_DYNVARS_161_05----------------------------#' -######################################################################### -# Test if accessing global sql_notes gives error # -######################################################################### - -SET @@global.sql_notes = 1-@@global.sql_notes; -SELECT @@global.sql_notes; -SET @@global.sql_notes = 1-@@global.sql_notes; -SELECT @@global.sql_notes; - ---echo '#----------------------FN_DYNVARS_161_06------------------------#' -######################################################################### -# Check if the value in GLOBAL Table contains variable value # -######################################################################### - -SELECT count(VARIABLE_VALUE) FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='sql_notes'; - ---echo '#----------------------FN_DYNVARS_161_07------------------------#' -######################################################################### -# Check if the value in GLOBAL Table matches value in variable # -######################################################################### - -SELECT IF(@@session.sql_notes, "ON", "OFF") = VARIABLE_VALUE -FROM INFORMATION_SCHEMA.SESSION_VARIABLES -WHERE VARIABLE_NAME='sql_notes'; -SELECT @@session.sql_notes; -SELECT VARIABLE_VALUE -FROM INFORMATION_SCHEMA.SESSION_VARIABLES -WHERE VARIABLE_NAME='sql_notes'; - ---echo '#---------------------FN_DYNVARS_161_08-------------------------#' -################################################################### -# Check if ON and OFF values can be used on variable # -################################################################### - -SET @@session.sql_notes = OFF; -SELECT @@session.sql_notes; -SET @@session.sql_notes = ON; -SELECT @@session.sql_notes; - ---echo '#---------------------FN_DYNVARS_161_09----------------------#' -################################################################### -# Check if TRUE and FALSE values can be used on variable # -################################################################### - -SET @@session.sql_notes = TRUE; -SELECT @@session.sql_notes; -SET @@session.sql_notes = FALSE; -SELECT @@session.sql_notes; - -############################## -# Restore initial value # -############################## - -SET @@session.sql_notes = @session_start_value; -SELECT @@session.sql_notes; - -############################################################# -# END OF sql_notes TESTS # -############################################################# - diff --git a/mysql-test/suite/sys_vars/t/stored_program_cache_func.test b/mysql-test/suite/sys_vars/t/stored_program_cache_func.test index 611c33b5..0a7340eb 100644 --- a/mysql-test/suite/sys_vars/t/stored_program_cache_func.test +++ b/mysql-test/suite/sys_vars/t/stored_program_cache_func.test @@ -33,9 +33,11 @@ create procedure pr(i int) begin end | --delimiter ; call pr(1); ---error ER_BAD_FIELD_ERROR +#--error ER_BAD_FIELD_ERROR +# MDEV-5816 added support for recompilation of statements +# inside a stored routine so the error ER_BAD_FIELD_ERROR is +# no more expcted call pr(2); -drop table t1; set global stored_program_cache=0; call pr(1); diff --git a/mysql-test/suite/sys_vars/t/thread_pool_idle_timeout_grant.test b/mysql-test/suite/sys_vars/t/thread_pool_idle_timeout_grant.test index 8f5f2491..33b97ac6 100644 --- a/mysql-test/suite/sys_vars/t/thread_pool_idle_timeout_grant.test +++ b/mysql-test/suite/sys_vars/t/thread_pool_idle_timeout_grant.test @@ -8,11 +8,11 @@ SET @global=@@global.thread_pool_idle_timeout; --echo # MDEV-21961 Bind CONNECTION ADMIN to a number of global system variables --echo # ---echo # Test that "SET thread_pool_idle_timeout" is not allowed without CONNECTION ADMIN or SUPER +--echo # 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 --error ER_SPECIFIC_ACCESS_DENIED_ERROR @@ -40,19 +40,4 @@ SET SESSION thread_pool_idle_timeout=10; --connection default DROP USER user1@localhost; ---echo # 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; ---error ER_GLOBAL_VARIABLE -SET thread_pool_idle_timeout=10; ---error ER_GLOBAL_VARIABLE -SET SESSION thread_pool_idle_timeout=10; ---disconnect user1 ---connection default -DROP USER user1@localhost; - SET @@global.thread_pool_idle_timeout=@global; diff --git a/mysql-test/suite/sys_vars/t/thread_pool_max_threads_grant.test b/mysql-test/suite/sys_vars/t/thread_pool_max_threads_grant.test index 299d5ff4..b77df149 100644 --- a/mysql-test/suite/sys_vars/t/thread_pool_max_threads_grant.test +++ b/mysql-test/suite/sys_vars/t/thread_pool_max_threads_grant.test @@ -8,11 +8,11 @@ SET @global=@@global.thread_pool_max_threads; --echo # MDEV-21961 Bind CONNECTION ADMIN to a number of global system variables --echo # ---echo # Test that "SET thread_pool_max_threads" is not allowed without CONNECTION ADMIN or SUPER +--echo # 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 --error ER_SPECIFIC_ACCESS_DENIED_ERROR @@ -40,19 +40,4 @@ SET SESSION thread_pool_max_threads=10; --connection default DROP USER user1@localhost; ---echo # 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; ---error ER_GLOBAL_VARIABLE -SET thread_pool_max_threads=10; ---error ER_GLOBAL_VARIABLE -SET SESSION thread_pool_max_threads=10; ---disconnect user1 ---connection default -DROP USER user1@localhost; - SET @@global.thread_pool_max_threads=@global; diff --git a/mysql-test/suite/sys_vars/t/thread_pool_oversubscribe_grant.test b/mysql-test/suite/sys_vars/t/thread_pool_oversubscribe_grant.test index f3a96c69..3ff215ae 100644 --- a/mysql-test/suite/sys_vars/t/thread_pool_oversubscribe_grant.test +++ b/mysql-test/suite/sys_vars/t/thread_pool_oversubscribe_grant.test @@ -8,11 +8,11 @@ SET @global=@@global.thread_pool_oversubscribe; --echo # MDEV-21961 Bind CONNECTION ADMIN to a number of global system variables --echo # ---echo # Test that "SET thread_pool_oversubscribe" is not allowed without CONNECTION ADMIN or SUPER +--echo # 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 --error ER_SPECIFIC_ACCESS_DENIED_ERROR @@ -40,19 +40,4 @@ SET SESSION thread_pool_oversubscribe=10; --connection default DROP USER user1@localhost; ---echo # 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; ---error ER_GLOBAL_VARIABLE -SET thread_pool_oversubscribe=10; ---error ER_GLOBAL_VARIABLE -SET SESSION thread_pool_oversubscribe=10; ---disconnect user1 ---connection default -DROP USER user1@localhost; - SET @@global.thread_pool_oversubscribe=@global; diff --git a/mysql-test/suite/sys_vars/t/thread_pool_stall_limit_grant.test b/mysql-test/suite/sys_vars/t/thread_pool_stall_limit_grant.test index ae0ed8a7..2c57fecd 100644 --- a/mysql-test/suite/sys_vars/t/thread_pool_stall_limit_grant.test +++ b/mysql-test/suite/sys_vars/t/thread_pool_stall_limit_grant.test @@ -8,11 +8,11 @@ SET @global=@@global.thread_pool_stall_limit; --echo # MDEV-21961 Bind CONNECTION ADMIN to a number of global system variables --echo # ---echo # Test that "SET thread_pool_stall_limit" is not allowed without CONNECTION ADMIN or SUPER +--echo # 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 --error ER_SPECIFIC_ACCESS_DENIED_ERROR @@ -40,19 +40,4 @@ SET SESSION thread_pool_stall_limit=400; --connection default DROP USER user1@localhost; ---echo # 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; ---error ER_GLOBAL_VARIABLE -SET thread_pool_stall_limit=400; ---error ER_GLOBAL_VARIABLE -SET SESSION thread_pool_stall_limit=400; ---disconnect user1 ---connection default -DROP USER user1@localhost; - SET @@global.thread_pool_stall_limit=@global; diff --git a/mysql-test/suite/sys_vars/t/time_format_basic.test b/mysql-test/suite/sys_vars/t/time_format_basic.test deleted file mode 100644 index ec737b8c..00000000 --- a/mysql-test/suite/sys_vars/t/time_format_basic.test +++ /dev/null @@ -1,18 +0,0 @@ -# -# only global -# -select @@global.time_format; ---error ER_INCORRECT_GLOBAL_LOCAL_VAR -select @@session.time_format; -show global variables like 'time_format'; -show session variables like 'time_format'; -select * from information_schema.global_variables where variable_name='time_format'; -select * from information_schema.session_variables where variable_name='time_format'; - -# -# show that it's read-only -# ---error ER_INCORRECT_GLOBAL_LOCAL_VAR -set global time_format=1; ---error ER_INCORRECT_GLOBAL_LOCAL_VAR -set session time_format=1; diff --git a/mysql-test/suite/sys_vars/t/tx_isolation_basic.test b/mysql-test/suite/sys_vars/t/transaction_isolation_basic.test index 5b484cb9..3f0e8361 100644 --- a/mysql-test/suite/sys_vars/t/tx_isolation_basic.test +++ b/mysql-test/suite/sys_vars/t/transaction_isolation_basic.test @@ -1,6 +1,6 @@ -################# mysql-test\t\tx_isolation_basic.test ######################## +######## mysql-test\suite\sys_vars\t\transaction_isolation_basic.test ######### # # -# Variable Name: tx_isolation # +# Variable Name: transaction_isolation # # Scope: GLOBAL | SESSION # # Access Type: Dynamic # # Data Type: enumeration # @@ -11,7 +11,7 @@ # Creation Date: 2008-02-07 # # Author: Rizwan # # # -# Description: Test Cases of Dynamic System Variable tx_isolation # +# Description: Test Cases of Dynamic System Variable transaction_isolation # # that checks the behavior of this variable in the following ways# # * Default Value # # * Valid & Invalid values # @@ -26,31 +26,31 @@ --source include/load_sysvars.inc ######################################################################## -# START OF tx_isolation TESTS # +# START OF transaction_isolation TESTS # ######################################################################## ######################################################################### -# Saving initial value of tx_isolation in a temporary variable # +# Saving initial value of transaction_isolation in a temporary variable # ######################################################################### -SET @global_start_value = @@global.tx_isolation; +SET @global_start_value = @@global.transaction_isolation; SELECT @global_start_value; -SET @session_start_value = @@session.tx_isolation; +SET @session_start_value = @@session.transaction_isolation; SELECT @session_start_value; --echo '#--------------------FN_DYNVARS_183_01------------------------#' #################################################################### -# Display the DEFAULT value of tx_isolation # +# Display the DEFAULT value of transaction_isolation # #################################################################### -SET @@global.tx_isolation = 'READ-UNCOMMITTED'; -SET @@global.tx_isolation = DEFAULT; -SELECT @@global.tx_isolation; +SET @@global.transaction_isolation = 'READ-UNCOMMITTED'; +SET @@global.transaction_isolation = DEFAULT; +SELECT @@global.transaction_isolation; -SET @@session.tx_isolation = DEFAULT; -SELECT @@session.tx_isolation; +SET @@session.transaction_isolation = DEFAULT; +SELECT @@session.transaction_isolation; --echo '#---------------------FN_DYNVARS_183_02-------------------------#' ######################################################### @@ -58,97 +58,97 @@ SELECT @@session.tx_isolation; ######################################################### --Error ER_WRONG_VALUE_FOR_VAR -SET @@global.tx_isolation = NULL; +SET @@global.transaction_isolation = NULL; --Error ER_WRONG_VALUE_FOR_VAR -SET @@global.tx_isolation = ''; +SET @@global.transaction_isolation = ''; --Error ER_WRONG_VALUE_FOR_VAR -SET @@session.tx_isolation = NULL; +SET @@session.transaction_isolation = NULL; --Error ER_WRONG_VALUE_FOR_VAR -SET @@session.tx_isolation = ''; +SET @@session.transaction_isolation = ''; --echo '#--------------------FN_DYNVARS_183_03------------------------#' ##################################################################### -# Change the value of tx_isolation to a valid value # +# Change the value of transaction_isolation to a valid value # ##################################################################### -SET @@global.tx_isolation = 'READ-UNCOMMITTED'; -SELECT @@global.tx_isolation; +SET @@global.transaction_isolation = 'READ-UNCOMMITTED'; +SELECT @@global.transaction_isolation; -SET @@global.tx_isolation = 'read-COMMITTED'; -SELECT @@global.tx_isolation; +SET @@global.transaction_isolation = 'read-COMMITTED'; +SELECT @@global.transaction_isolation; -SET @@global.tx_isolation = 'REPEATABLE-READ'; -SELECT @@global.tx_isolation; +SET @@global.transaction_isolation = 'REPEATABLE-READ'; +SELECT @@global.transaction_isolation; -SET @@global.tx_isolation = 'SERIALIZable'; -SELECT @@global.tx_isolation; +SET @@global.transaction_isolation = 'SERIALIZable'; +SELECT @@global.transaction_isolation; -SET @@session.tx_isolation = 'READ-UNCOMMITTED'; -SELECT @@session.tx_isolation; +SET @@session.transaction_isolation = 'READ-UNCOMMITTED'; +SELECT @@session.transaction_isolation; -SET @@session.tx_isolation = 'READ-COMMITTED'; -SELECT @@session.tx_isolation; +SET @@session.transaction_isolation = 'READ-COMMITTED'; +SELECT @@session.transaction_isolation; -SET @@session.tx_isolation = 'REPEATABLE-READ'; -SELECT @@session.tx_isolation; +SET @@session.transaction_isolation = 'REPEATABLE-READ'; +SELECT @@session.transaction_isolation; -SET @@session.tx_isolation = 'serializable'; -SELECT @@session.tx_isolation; +SET @@session.transaction_isolation = 'serializable'; +SELECT @@session.transaction_isolation; --echo '#--------------------FN_DYNVARS_183_04-------------------------#' ####################################################################### -# Change the value of tx_isolation to invalid value # +# Change the value of transaction_isolation to invalid value # ####################################################################### # for global scope --Error ER_WRONG_VALUE_FOR_VAR -SET @@global.tx_isolation = -1; +SET @@global.transaction_isolation = -1; --Error ER_WRONG_VALUE_FOR_VAR -SET @@global.tx_isolation = READUNCOMMITTED; +SET @@global.transaction_isolation = READUNCOMMITTED; --Error ER_WRONG_VALUE_FOR_VAR -SET @@global.tx_isolation = 'REPEATABLE'; +SET @@global.transaction_isolation = 'REPEATABLE'; --Error ER_WRONG_VALUE_FOR_VAR -SET @@global.tx_isolation = OFF; +SET @@global.transaction_isolation = OFF; --Error ER_WRONG_VALUE_FOR_VAR -SET @@global.tx_isolation = ON; +SET @@global.transaction_isolation = ON; --Error ER_WRONG_VALUE_FOR_VAR -SET @@global.tx_isolation = 'NON-SERIALIZABLE'; +SET @@global.transaction_isolation = 'NON-SERIALIZABLE'; # for session scope --Error ER_WRONG_VALUE_FOR_VAR -SET @@tx_isolation = -1; +SET @@transaction_isolation = -1; --Error ER_WRONG_VALUE_FOR_VAR -SET @@tx_isolation = READUNCOMMITTED; +SET @@transaction_isolation = READUNCOMMITTED; --Error ER_WRONG_VALUE_FOR_VAR -SET @@tx_isolation = 'REPEATABLE'; +SET @@transaction_isolation = 'REPEATABLE'; --Error ER_WRONG_VALUE_FOR_VAR -SET @@tx_isolation = 'NONE'; +SET @@transaction_isolation = 'NONE'; --Error ER_WRONG_VALUE_FOR_VAR -SET @@tx_isolation = 'ALL'; +SET @@transaction_isolation = 'ALL'; --echo '#-------------------FN_DYNVARS_183_05----------------------------#' ######################################################################### # Check if the value in session Table matches value in variable # ######################################################################### -SELECT @@session.tx_isolation = VARIABLE_VALUE +SELECT @@session.transaction_isolation = VARIABLE_VALUE FROM INFORMATION_SCHEMA.SESSION_VARIABLES -WHERE VARIABLE_NAME='tx_isolation'; +WHERE VARIABLE_NAME='transaction_isolation'; --echo '#----------------------FN_DYNVARS_183_06------------------------#' ######################################################################### # Check if the value in GLOBAL Table matches value in variable # ######################################################################### -SELECT @@global.tx_isolation = VARIABLE_VALUE +SELECT @@global.transaction_isolation = VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES -WHERE VARIABLE_NAME='tx_isolation'; +WHERE VARIABLE_NAME='transaction_isolation'; --echo '#---------------------FN_DYNVARS_183_07-------------------------#' @@ -157,56 +157,56 @@ WHERE VARIABLE_NAME='tx_isolation'; ################################################################### # test if variable accepts 0,1,2 -SET @@global.tx_isolation = 0; -SELECT @@global.tx_isolation; +SET @@global.transaction_isolation = 0; +SELECT @@global.transaction_isolation; -SET @@global.tx_isolation = 1; -SELECT @@global.tx_isolation; +SET @@global.transaction_isolation = 1; +SELECT @@global.transaction_isolation; -SET @@global.tx_isolation = 2; -SELECT @@global.tx_isolation; +SET @@global.transaction_isolation = 2; +SELECT @@global.transaction_isolation; -SET @@global.tx_isolation = 3; -SELECT @@global.tx_isolation; +SET @@global.transaction_isolation = 3; +SELECT @@global.transaction_isolation; --Error ER_WRONG_TYPE_FOR_VAR -SET @@global.tx_isolation = 0.4; +SET @@global.transaction_isolation = 0.4; --echo '#---------------------FN_DYNVARS_183_08----------------------#' ################################################################### # Check if TRUE and FALSE values can be used on variable # ################################################################### -SET @@global.tx_isolation = TRUE; -SELECT @@global.tx_isolation; -SET @@global.tx_isolation = FALSE; -SELECT @@global.tx_isolation; +SET @@global.transaction_isolation = TRUE; +SELECT @@global.transaction_isolation; +SET @@global.transaction_isolation = FALSE; +SELECT @@global.transaction_isolation; --echo '#---------------------FN_DYNVARS_183_09----------------------#' -######################################################################## -# Check if tx_isolation can be accessed with and without @@ sign # -######################################################################## +########################################################################### +# Check if transaction_isolation can be accessed with and without @@ sign # +########################################################################### -SET tx_isolation = 'REPEATABLE-READ'; +SET transaction_isolation = 'REPEATABLE-READ'; #using SET SESSION|GLOBAL syntax -SET session tx_isolation = 'REPEATABLE-READ'; -SELECT @@tx_isolation; +SET session transaction_isolation = 'REPEATABLE-READ'; +SELECT @@transaction_isolation; -SET global tx_isolation = 'REPEATABLE-READ'; -SELECT @@global.tx_isolation; +SET global transaction_isolation = 'REPEATABLE-READ'; +SELECT @@global.transaction_isolation; ############################## # Restore initial value # ############################## -SET @@global.tx_isolation = @global_start_value; -SELECT @@global.tx_isolation; +SET @@global.transaction_isolation = @global_start_value; +SELECT @@global.transaction_isolation; -SET @@session.tx_isolation = @session_start_value; -SELECT @@session.tx_isolation; +SET @@session.transaction_isolation = @session_start_value; +SELECT @@session.transaction_isolation; #################################################################### -# END OF tx_isolation TESTS # +# END OF transaction_isolation TESTS # #################################################################### diff --git a/mysql-test/suite/sys_vars/t/tx_isolation_func-master.opt b/mysql-test/suite/sys_vars/t/transaction_isolation_func-master.opt index 67166a46..67166a46 100644 --- a/mysql-test/suite/sys_vars/t/tx_isolation_func-master.opt +++ b/mysql-test/suite/sys_vars/t/transaction_isolation_func-master.opt diff --git a/mysql-test/suite/sys_vars/t/tx_isolation_func.test b/mysql-test/suite/sys_vars/t/transaction_isolation_func.test index 164422be..085d59cb 100644 --- a/mysql-test/suite/sys_vars/t/tx_isolation_func.test +++ b/mysql-test/suite/sys_vars/t/transaction_isolation_func.test @@ -1,6 +1,6 @@ -############# mysql-test\t\tx_isolation_func.test ####################################### +############## mysql-test\suite\sys_vars\t\transaction_isolation_func.test ############## # # -# Variable Name: tx_isolation # +# Variable Name: transaction_isolation # # Scope: GLOBAL & SESSION # # Access Type: Dynamic # # Data Type: ENUMERATION # @@ -11,7 +11,7 @@ # Creation Date: 2008-02-25 # # Author: Sharique Abdullah # # # -# Description: Test Cases of Dynamic System Variable "tx_isolation" # +# Description: Test Cases of Dynamic System Variable "transaction_isolation" # # that checks behavior of this variable in the following ways # # * Functionality based on different values # # # @@ -26,8 +26,8 @@ # 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; # # Creating connections @@ -68,11 +68,11 @@ INSERT INTO t1 VALUES(24, 24); # Testing for value READ-UNCOMMITTED # 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; # @@ -139,10 +139,10 @@ COMMIT; # Testing for value READ-COMMITTED # 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'; # # Testing WHERE on keys using % on even rows @@ -177,10 +177,10 @@ COMMIT; # Testing for value REPEATABLE-READ # 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'; # # Testing WHERE on keys using % on even rows @@ -279,10 +279,10 @@ COMMIT; # Testing for value SERIALIZABLE # connection con0; -SET SESSION tx_isolation = 'SERIALIZABLE'; +SET SESSION transaction_isolation = 'SERIALIZABLE'; connection con1; -SET SESSION tx_isolation = 'SERIALIZABLE'; +SET SESSION transaction_isolation = 'SERIALIZABLE'; # # Testing WHERE on keys using # on even rows @@ -321,33 +321,33 @@ COMMIT; # Session data integrity check & GLOBAL Value check # -SET GLOBAL tx_isolation = 'READ-UNCOMMITTED'; +SET GLOBAL transaction_isolation = 'READ-UNCOMMITTED'; connect (con_int1,localhost,root,,); connection con_int1; -SELECT @@SESSION.tx_isolation; +SELECT @@SESSION.transaction_isolation; --echo 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; +SELECT @@SESSION.transaction_isolation; --echo READ-UNCOMMITTED Expected -SET SESSION tx_isolation = 'REPEATABLE-READ'; +SET SESSION transaction_isolation = 'REPEATABLE-READ'; connection con_int2; -SELECT @@SESSION.tx_isolation; +SELECT @@SESSION.transaction_isolation; --echo REPEATABLE-READ Expected connection con_int1; -SELECT @@SESSION.tx_isolation; +SELECT @@SESSION.transaction_isolation; --echo SERIALIZABLE Expected -SELECT @@GLOBAL.tx_isolation; +SELECT @@GLOBAL.transaction_isolation; --echo READ-UNCOMMITTED Expected connection default; @@ -359,8 +359,8 @@ disconnect con_int2; # Cleanup # -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; diff --git a/mysql-test/suite/sys_vars/t/tx_read_only_basic.test b/mysql-test/suite/sys_vars/t/transaction_read_only_basic.test index 0ebfcc31..ba8d65a5 100644 --- a/mysql-test/suite/sys_vars/t/tx_read_only_basic.test +++ b/mysql-test/suite/sys_vars/t/transaction_read_only_basic.test @@ -1,6 +1,6 @@ -############## mysql-test\t\tx_read_only_basic.test ########################### +######## mysql-test\suite\sys_vars\t\transaction_read_only_basic.test ######### # # -# Variable Name: tx_read_only # +# Variable Name: transaction_read_only # # Scope: GLOBAL & SESSION # # Access Type: Dynamic # # Data Type: boolean # @@ -11,7 +11,7 @@ # Creation Date: 2012-01-12 # # Author: joh # # # -# Description: Test Cases of Dynamic System Variable tx_read_only # +# Description: Test Cases of Dynamic System Variable transaction_read_only # # that checks the behavior of this variable in the following ways# # * Default Value # # * Valid & Invalid values # @@ -26,7 +26,7 @@ --source include/load_sysvars.inc --echo #################################################################### ---echo # START OF tx_read_only TESTS # +--echo # START OF transaction_read_only TESTS # --echo #################################################################### @@ -34,101 +34,101 @@ --echo # Save initial value # --echo ############################################################# -SET @start_global_value = @@global.tx_read_only; +SET @start_global_value = @@global.transaction_read_only; SELECT @start_global_value; -SET @start_session_value = @@session.tx_read_only; +SET @start_session_value = @@session.transaction_read_only; SELECT @start_session_value; --echo ######################################################################## ---echo # Display the DEFAULT value of tx_read_only # +--echo # Display the DEFAULT value of transaction_read_only # --echo ######################################################################## -SET @@global.tx_read_only = ON; -SET @@global.tx_read_only = DEFAULT; -SELECT @@global.tx_read_only; +SET @@global.transaction_read_only = ON; +SET @@global.transaction_read_only = DEFAULT; +SELECT @@global.transaction_read_only; -SET @@session.tx_read_only = ON; -SET @@session.tx_read_only = DEFAULT; -SELECT @@session.tx_read_only; +SET @@session.transaction_read_only = ON; +SET @@session.transaction_read_only = DEFAULT; +SELECT @@session.transaction_read_only; ---echo ############################################################################## ---echo # Change the value of tx_read_only to a valid value for GLOBAL Scope # ---echo ############################################################################## +--echo ############################################################################### +--echo # Change the value of transaction_read_only to a valid value for GLOBAL Scope # +--echo ############################################################################### -SET @@global.tx_read_only = ON; -SELECT @@global.tx_read_only; -SET @@global.tx_read_only = OFF; -SELECT @@global.tx_read_only; -SET @@global.tx_read_only = 0; -SELECT @@global.tx_read_only; -SET @@global.tx_read_only = 1; -SELECT @@global.tx_read_only; -SET @@global.tx_read_only = TRUE; -SELECT @@global.tx_read_only; -SET @@global.tx_read_only = FALSE; -SELECT @@global.tx_read_only; +SET @@global.transaction_read_only = ON; +SELECT @@global.transaction_read_only; +SET @@global.transaction_read_only = OFF; +SELECT @@global.transaction_read_only; +SET @@global.transaction_read_only = 0; +SELECT @@global.transaction_read_only; +SET @@global.transaction_read_only = 1; +SELECT @@global.transaction_read_only; +SET @@global.transaction_read_only = TRUE; +SELECT @@global.transaction_read_only; +SET @@global.transaction_read_only = FALSE; +SELECT @@global.transaction_read_only; ---echo ############################################################################### ---echo # Change the value of tx_read_only to a valid value for SESSION Scope # ---echo ############################################################################### +--echo ################################################################################ +--echo # Change the value of transaction_read_only to a valid value for SESSION Scope # +--echo ################################################################################ -SET @@session.tx_read_only = ON; -SELECT @@session.tx_read_only; -SET @@session.tx_read_only = OFF; -SELECT @@session.tx_read_only; -SET @@session.tx_read_only = 0; -SELECT @@session.tx_read_only; -SET @@session.tx_read_only = 1; -SELECT @@session.tx_read_only; -SET @@session.tx_read_only = TRUE; -SELECT @@session.tx_read_only; -SET @@session.tx_read_only = FALSE; -SELECT @@session.tx_read_only; - - ---echo ################################################################ ---echo # Change the value of tx_read_only to an invalid value # ---echo ################################################################ +SET @@session.transaction_read_only = ON; +SELECT @@session.transaction_read_only; +SET @@session.transaction_read_only = OFF; +SELECT @@session.transaction_read_only; +SET @@session.transaction_read_only = 0; +SELECT @@session.transaction_read_only; +SET @@session.transaction_read_only = 1; +SELECT @@session.transaction_read_only; +SET @@session.transaction_read_only = TRUE; +SELECT @@session.transaction_read_only; +SET @@session.transaction_read_only = FALSE; +SELECT @@session.transaction_read_only; + + +--echo ################################################################# +--echo # Change the value of transaction_read_only to an invalid value # +--echo ################################################################# --Error ER_WRONG_VALUE_FOR_VAR -SET @@global.tx_read_only = 'ONN'; +SET @@global.transaction_read_only = 'ONN'; --Error ER_WRONG_VALUE_FOR_VAR -SET @@global.tx_read_only = "OFFF"; +SET @@global.transaction_read_only = "OFFF"; --Error ER_WRONG_VALUE_FOR_VAR -SET @@global.tx_read_only = TTRUE; +SET @@global.transaction_read_only = TTRUE; --Error ER_WRONG_VALUE_FOR_VAR -SET @@global.tx_read_only = FELSE; +SET @@global.transaction_read_only = FELSE; --Error ER_WRONG_VALUE_FOR_VAR -SET @@global.tx_read_only = -1024; +SET @@global.transaction_read_only = -1024; --Error ER_WRONG_VALUE_FOR_VAR -SET @@global.tx_read_only = 65536; +SET @@global.transaction_read_only = 65536; --Error ER_WRONG_TYPE_FOR_VAR -SET @@global.tx_read_only = 65530.34; +SET @@global.transaction_read_only = 65530.34; --Error ER_WRONG_VALUE_FOR_VAR -SET @@global.tx_read_only = test; +SET @@global.transaction_read_only = test; --Error ER_WRONG_VALUE_FOR_VAR -SET @@session.tx_read_only = ONN; +SET @@session.transaction_read_only = ONN; --Error ER_WRONG_VALUE_FOR_VAR -SET @@session.tx_read_only = ONF; +SET @@session.transaction_read_only = ONF; --Error ER_WRONG_VALUE_FOR_VAR -SET @@session.tx_read_only = OF; +SET @@session.transaction_read_only = OF; --Error ER_WRONG_VALUE_FOR_VAR -SET @@session.tx_read_only = 'OFN'; +SET @@session.transaction_read_only = 'OFN'; --Error ER_WRONG_VALUE_FOR_VAR -SET @@session.tx_read_only = -2; +SET @@session.transaction_read_only = -2; --Error ER_WRONG_TYPE_FOR_VAR -SET @@session.tx_read_only = 65530.34; +SET @@session.transaction_read_only = 65530.34; --Error ER_WRONG_VALUE_FOR_VAR -SET @@session.tx_read_only = 65550; +SET @@session.transaction_read_only = 65550; --Error ER_WRONG_VALUE_FOR_VAR -SET @@session.tx_read_only = test; -SELECT @@session.tx_read_only; +SET @@session.transaction_read_only = test; +SELECT @@session.transaction_read_only; --echo #################################################################### @@ -136,26 +136,26 @@ SELECT @@session.tx_read_only; --echo #################################################################### -SELECT IF(@@global.tx_read_only, "ON", "OFF") = VARIABLE_VALUE +SELECT IF(@@global.transaction_read_only, "ON", "OFF") = VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES -WHERE VARIABLE_NAME='tx_read_only'; +WHERE VARIABLE_NAME='transaction_read_only'; --echo #################################################################### --echo # Check if the value in SESSION Table matches value in variable # --echo #################################################################### -SELECT IF(@@session.tx_read_only, "ON", "OFF") = VARIABLE_VALUE +SELECT IF(@@session.transaction_read_only, "ON", "OFF") = VARIABLE_VALUE FROM INFORMATION_SCHEMA.SESSION_VARIABLES -WHERE VARIABLE_NAME='tx_read_only'; +WHERE VARIABLE_NAME='transaction_read_only'; --echo ############################################################################### --echo # Check if accessing variable with and without GLOBAL point to same variable # --echo ############################################################################### -SET @@tx_read_only = OFF; -SET @@global.tx_read_only = ON; -SELECT @@tx_read_only = @@global.tx_read_only; +SET @@transaction_read_only = OFF; +SET @@global.transaction_read_only = ON; +SELECT @@transaction_read_only = @@global.transaction_read_only; --echo ############################################################################## @@ -163,37 +163,37 @@ SELECT @@tx_read_only = @@global.tx_read_only; --echo # to same session variable # --echo ############################################################################## -SET @@tx_read_only = ON; -SELECT @@tx_read_only = @@local.tx_read_only; -SELECT @@local.tx_read_only = @@session.tx_read_only; +SET @@transaction_read_only = ON; +SELECT @@transaction_read_only = @@local.transaction_read_only; +SELECT @@local.transaction_read_only = @@session.transaction_read_only; --echo ############################################################################### ---echo # Check if tx_read_only can be accessed with and without @@ sign # +--echo # Check if transaction_read_only can be accessed with and without @@ sign # --echo ############################################################################### --echo # @@session is synonym for SESSION -SET @@session.tx_read_only= 0; +SET @@session.transaction_read_only= 0; --echo # Without modifier, SET changes session variable -SET tx_read_only = 1; -SELECT @@tx_read_only; +SET transaction_read_only = 1; +SELECT @@transaction_read_only; --echo # name1.name2 refers to database_name.table_name --Error ER_UNKNOWN_TABLE -SELECT session.tx_read_only; +SELECT session.transaction_read_only; --echo #################################### --echo # Restore initial value # --echo #################################### -SET @@global.tx_read_only = @start_global_value; -SELECT @@global.tx_read_only; -SET @@session.tx_read_only = @start_session_value; -SELECT @@session.tx_read_only; +SET @@global.transaction_read_only = @start_global_value; +SELECT @@global.transaction_read_only; +SET @@session.transaction_read_only = @start_session_value; +SELECT @@session.transaction_read_only; --echo ######################################################### ---echo # END OF tx_read_only TESTS # +--echo # END OF transaction_read_only TESTS # --echo ######################################################### diff --git a/mysql-test/suite/sys_vars/t/tx_compatibility-master.opt b/mysql-test/suite/sys_vars/t/tx_compatibility-master.opt new file mode 100644 index 00000000..f22a5ebb --- /dev/null +++ b/mysql-test/suite/sys_vars/t/tx_compatibility-master.opt @@ -0,0 +1,2 @@ +--transaction-isolation=SERIALIZABLE +--transaction-read-only diff --git a/mysql-test/suite/sys_vars/t/tx_compatibility.test b/mysql-test/suite/sys_vars/t/tx_compatibility.test new file mode 100644 index 00000000..2521c366 --- /dev/null +++ b/mysql-test/suite/sys_vars/t/tx_compatibility.test @@ -0,0 +1,68 @@ +--echo # +--echo # MDEV-21921 Make transaction_isolation and transaction_read_only into +--echo # system variables +--echo # + +SET @saved_global_isolation= @@global.transaction_isolation; +SET @saved_global_read_only= @@global.transaction_read_only; + +--echo # Case 1: Check the influence of --transaction_* on +--echo # @@session.transaction_* and @@global.transaction_*, +--echo # @@session.tx_*, @@global.tx_*. + +SELECT @@session.transaction_isolation, @@global.transaction_isolation, + @@session.tx_isolation, @@global.tx_isolation; +SHOW GLOBAL VARIABLES LIKE '%_isolation'; +SHOW SESSION VARIABLES LIKE '%_isolation'; + +SELECT @@session.transaction_read_only, @@global.transaction_read_only, + @@session.tx_read_only, @@global.tx_read_only; +SHOW GLOBAL VARIABLES LIKE '%_read_only'; +SHOW SESSION VARIABLES LIKE '%_read_only'; + +--echo # Case 2: Check that the change to tx_* is reflected to transaction_*. + +SET tx_isolation= 'REPEATABLE-READ'; +SET @@global.tx_isolation= 'SERIALIZABLE'; +SELECT @@session.tx_isolation, @@global.tx_isolation, +@@session.transaction_isolation, @@global.transaction_isolation; +SHOW GLOBAL VARIABLES LIKE '%_isolation'; +SHOW SESSION VARIABLES LIKE '%_isolation'; + +SET STATEMENT tx_isolation= 'SERIALIZABLE' FOR SHOW SESSION VARIABLES LIKE '%_isolation'; +SHOW SESSION VARIABLES LIKE '%_isolation'; + +SET tx_read_only= OFF; +SET @@global.tx_read_only= ON; +SELECT @@session.tx_read_only, @@global.tx_read_only, +@@session.transaction_read_only, @@global.transaction_read_only; +SHOW GLOBAL VARIABLES LIKE '%_read_only'; +SHOW SESSION VARIABLES LIKE '%_read_only'; + +SET STATEMENT tx_read_only= ON FOR SHOW SESSION VARIABLES LIKE '%_read_only'; +SHOW SESSION VARIABLES LIKE '%_read_only'; + +--echo # 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; +SHOW GLOBAL VARIABLES LIKE '%_isolation'; +SHOW SESSION VARIABLES LIKE '%_isolation'; + +SET STATEMENT transaction_isolation= 'REPEATABLE-READ' FOR SHOW SESSION VARIABLES LIKE '%_isolation'; +SHOW SESSION VARIABLES LIKE '%_isolation'; + +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; +SHOW GLOBAL VARIABLES LIKE '%_read_only'; +SHOW SESSION VARIABLES LIKE '%_read_only'; + +SET STATEMENT transaction_read_only= OFF FOR SHOW SESSION VARIABLES LIKE '%_read_only'; +SHOW SESSION VARIABLES LIKE '%_read_only'; + +SET @@global.transaction_isolation= @saved_global_isolation; +SET @@global.transaction_read_only= @saved_global_read_only; diff --git a/mysql-test/suite/sys_vars/t/version.test b/mysql-test/suite/sys_vars/t/version.test index 35067a43..43c9d9ae 100644 --- a/mysql-test/suite/sys_vars/t/version.test +++ b/mysql-test/suite/sys_vars/t/version.test @@ -1,6 +1,6 @@ SELECT @@version; perl; - $cnt= $ENV{MYSQL_TEST} =~ /mysqltest_embedded / ? 1 : + $cnt= $ENV{MYSQL_TEST} =~ /embedded / ? 1 : grep /my_favorite_version/, `$ENV{MYSQL} -e status`; print "$cnt\n"; EOF diff --git a/mysql-test/suite/sys_vars/t/wsrep_causal_reads_basic.test b/mysql-test/suite/sys_vars/t/wsrep_causal_reads_basic.test deleted file mode 100644 index 6539e5cb..00000000 --- a/mysql-test/suite/sys_vars/t/wsrep_causal_reads_basic.test +++ /dev/null @@ -1,45 +0,0 @@ ---source include/have_wsrep.inc - ---echo # ---echo # wsrep_causal_reads ---echo # - ---echo # save the initial values -SET @wsrep_causal_reads_global_saved = @@global.wsrep_causal_reads; -SET @wsrep_causal_reads_session_saved = @@session.wsrep_causal_reads; - ---echo # default -SELECT @@global.wsrep_causal_reads; -SELECT @@session.wsrep_causal_reads; - ---echo ---echo # scope and valid values -SET @@global.wsrep_causal_reads=OFF; -SELECT @@global.wsrep_causal_reads; -SET @@global.wsrep_causal_reads=ON; -SELECT @@global.wsrep_causal_reads; - -SET @@session.wsrep_causal_reads=OFF; -SELECT @@session.wsrep_causal_reads; -SET @@session.wsrep_causal_reads=ON; -SELECT @@session.wsrep_causal_reads; -SET @@session.wsrep_causal_reads=default; -SELECT @@session.wsrep_causal_reads; - ---echo ---echo # invalid values ---error ER_WRONG_VALUE_FOR_VAR -SET @@global.wsrep_causal_reads=NULL; ---error ER_WRONG_VALUE_FOR_VAR -SET @@global.wsrep_causal_reads='junk'; ---error ER_WRONG_VALUE_FOR_VAR -SET @@session.wsrep_causal_reads=NULL; ---error ER_WRONG_VALUE_FOR_VAR -SET @@session.wsrep_causal_reads='junk'; - ---echo ---echo # restore the initial values -SET @@global.wsrep_causal_reads = @wsrep_causal_reads_global_saved; -SET @@session.wsrep_causal_reads = @wsrep_causal_reads_session_saved; - ---echo # End of test |