Skip to content

M
MariaDB
Commit f89a5c9a authored by Oleksandr Byelkin's avatar Oleksandr Byelkin
Browse files
Options

MDEV-11825: Make session variables TRACKING enabled by default

parent ebe47c34
Hide whitespace changes
Inline Side-by-side
Showing with 20 additions and 26 deletions
mysql-test/r/mysqld--help.result
View file @ f89a5c9a
...@@ -937,11 +937,7 @@ The following options may be given as the first argument: ...@@ -937,11 +937,7 @@ The following options may be given as the first argument:
--session-track-state-change --session-track-state-change
Track changes to the session state. Track changes to the session state.
--session-track-system-variables=name --session-track-system-variables=name
Track changes in registered system variables. For Track changes in registered system variables.
compatibility with MySQL defaults this variable should be
set to "autocommit, character_set_client,
character_set_connection, character_set_results,
time_zone"
--session-track-transaction-info=name --session-track-transaction-info=name
Track changes to the transaction attributes. OFF to Track changes to the transaction attributes. OFF to
disable; STATE to track just transaction state (Is there disable; STATE to track just transaction state (Is there
...@@ -1457,7 +1453,7 @@ secure-file-priv (No default value) ...@@ -1457,7 +1453,7 @@ secure-file-priv (No default value)
server-id 1 server-id 1
session-track-schema TRUE session-track-schema TRUE
session-track-state-change FALSE session-track-state-change FALSE
session-track-system-variables session-track-system-variables autocommit,character_set_client,character_set_connection,character_set_results,time_zone
session-track-transaction-info OFF session-track-transaction-info OFF
show-slave-auth-info FALSE show-slave-auth-info FALSE
silent-startup FALSE silent-startup FALSE
......
mysql-test/suite/sys_vars/r/session_track_system_variables_basic.result
View file @ f89a5c9a
...@@ -5,25 +5,25 @@ ...@@ -5,25 +5,25 @@
# Global - default # Global - default
SELECT @@global.session_track_system_variables; SELECT @@global.session_track_system_variables;
@@global.session_track_system_variables @@global.session_track_system_variables
autocommit,character_set_client,character_set_connection,character_set_results,time_zone
# Session - default # Session - default
SELECT @@session.session_track_system_variables; SELECT @@session.session_track_system_variables;
@@session.session_track_system_variables @@session.session_track_system_variables
autocommit,character_set_client,character_set_connection,character_set_results,time_zone
# via INFORMATION_SCHEMA.GLOBAL_VARIABLES # via INFORMATION_SCHEMA.GLOBAL_VARIABLES
SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME LIKE 'session_track%' ORDER BY VARIABLE_NAME; SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME LIKE 'session_track%' ORDER BY VARIABLE_NAME;
VARIABLE_NAME VARIABLE_VALUE VARIABLE_NAME VARIABLE_VALUE
SESSION_TRACK_SCHEMA ON SESSION_TRACK_SCHEMA ON
SESSION_TRACK_STATE_CHANGE OFF SESSION_TRACK_STATE_CHANGE OFF
SESSION_TRACK_SYSTEM_VARIABLES SESSION_TRACK_SYSTEM_VARIABLES autocommit,character_set_client,character_set_connection,character_set_results,time_zone
SESSION_TRACK_TRANSACTION_INFO OFF SESSION_TRACK_TRANSACTION_INFO OFF
# via INFORMATION_SCHEMA.SESSION_VARIABLES # via INFORMATION_SCHEMA.SESSION_VARIABLES
SELECT * FROM INFORMATION_SCHEMA.SESSION_VARIABLES WHERE VARIABLE_NAME LIKE 'session_track%' ORDER BY VARIABLE_NAME; SELECT * FROM INFORMATION_SCHEMA.SESSION_VARIABLES WHERE VARIABLE_NAME LIKE 'session_track%' ORDER BY VARIABLE_NAME;
VARIABLE_NAME VARIABLE_VALUE VARIABLE_NAME VARIABLE_VALUE
SESSION_TRACK_SCHEMA ON SESSION_TRACK_SCHEMA ON
SESSION_TRACK_STATE_CHANGE OFF SESSION_TRACK_STATE_CHANGE OFF
SESSION_TRACK_SYSTEM_VARIABLES SESSION_TRACK_SYSTEM_VARIABLES autocommit,character_set_client,character_set_connection,character_set_results,time_zone
SESSION_TRACK_TRANSACTION_INFO OFF SESSION_TRACK_TRANSACTION_INFO OFF
SET @global_saved_tmp = @@global.session_track_system_variables; SET @global_saved_tmp = @@global.session_track_system_variables;
...@@ -34,7 +34,7 @@ SELECT @@global.session_track_system_variables; ...@@ -34,7 +34,7 @@ SELECT @@global.session_track_system_variables;
autocommit autocommit
SELECT @@session.session_track_system_variables; SELECT @@session.session_track_system_variables;
@@session.session_track_system_variables @@session.session_track_system_variables
autocommit,character_set_client,character_set_connection,character_set_results,time_zone
# Altering session variable's value # Altering session variable's value
SET @@session.session_track_system_variables='autocommit'; SET @@session.session_track_system_variables='autocommit';
...@@ -72,25 +72,25 @@ SET @@session.session_track_system_variables = DEFAULT; ...@@ -72,25 +72,25 @@ SET @@session.session_track_system_variables = DEFAULT;
SELECT @@global.session_track_system_variables; SELECT @@global.session_track_system_variables;
@@global.session_track_system_variables @@global.session_track_system_variables
autocommit,character_set_client,character_set_connection,character_set_results,time_zone
SELECT @@session.session_track_system_variables; SELECT @@session.session_track_system_variables;
@@session.session_track_system_variables @@session.session_track_system_variables
autocommit,character_set_client,character_set_connection,character_set_results,time_zone
# Variables' values in a new session (con2). # Variables' values in a new session (con2).
connect con2,"127.0.0.1",root,,test,$MASTER_MYPORT,; connect con2,"127.0.0.1",root,,test,$MASTER_MYPORT,;
SELECT @@global.session_track_system_variables; SELECT @@global.session_track_system_variables;
@@global.session_track_system_variables @@global.session_track_system_variables
autocommit,character_set_client,character_set_connection,character_set_results,time_zone
SELECT @@session.session_track_system_variables; SELECT @@session.session_track_system_variables;
@@session.session_track_system_variables @@session.session_track_system_variables
autocommit,character_set_client,character_set_connection,character_set_results,time_zone
# Altering session should not affect global. # Altering session should not affect global.
SET @@session.session_track_system_variables = 'sql_mode'; SET @@session.session_track_system_variables = 'sql_mode';
SELECT @@global.session_track_system_variables; SELECT @@global.session_track_system_variables;
@@global.session_track_system_variables @@global.session_track_system_variables
autocommit,character_set_client,character_set_connection,character_set_results,time_zone
SELECT @@session.session_track_system_variables; SELECT @@session.session_track_system_variables;
@@session.session_track_system_variables @@session.session_track_system_variables
sql_mode sql_mode
...@@ -104,7 +104,7 @@ SELECT @@global.session_track_system_variables; ...@@ -104,7 +104,7 @@ SELECT @@global.session_track_system_variables;
sql_mode sql_mode
SELECT @@session.session_track_system_variables; SELECT @@session.session_track_system_variables;
@@session.session_track_system_variables @@session.session_track_system_variables
autocommit,character_set_client,character_set_connection,character_set_results,time_zone
# Switching to the default connection. # Switching to the default connection.
connection default; connection default;
......
mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result
View file @ f89a5c9a
...@@ -3930,13 +3930,13 @@ ENUM_VALUE_LIST OFF,ON ...@@ -3930,13 +3930,13 @@ ENUM_VALUE_LIST OFF,ON
READ_ONLY NO READ_ONLY NO
COMMAND_LINE_ARGUMENT OPTIONAL COMMAND_LINE_ARGUMENT OPTIONAL
VARIABLE_NAME SESSION_TRACK_SYSTEM_VARIABLES VARIABLE_NAME SESSION_TRACK_SYSTEM_VARIABLES
SESSION_VALUE SESSION_VALUE autocommit,character_set_client,character_set_connection,character_set_results,time_zone
GLOBAL_VALUE GLOBAL_VALUE autocommit,character_set_client,character_set_connection,character_set_results,time_zone
GLOBAL_VALUE_ORIGIN COMPILE-TIME GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE DEFAULT_VALUE autocommit,character_set_client,character_set_connection,character_set_results,time_zone
VARIABLE_SCOPE SESSION VARIABLE_SCOPE SESSION
VARIABLE_TYPE VARCHAR VARIABLE_TYPE VARCHAR
VARIABLE_COMMENT Track changes in registered system variables. For compatibility with MySQL defaults this variable should be set to "autocommit, character_set_client, character_set_connection, character_set_results, time_zone" VARIABLE_COMMENT Track changes in registered system variables.
NUMERIC_MIN_VALUE NULL NUMERIC_MIN_VALUE NULL
NUMERIC_MAX_VALUE NULL NUMERIC_MAX_VALUE NULL
NUMERIC_BLOCK_SIZE NULL NUMERIC_BLOCK_SIZE NULL
......
sql/sys_vars.cc
View file @ f89a5c9a
...@@ -5472,12 +5472,10 @@ static Sys_var_ulonglong Sys_max_thread_mem( ...@@ -5472,12 +5472,10 @@ static Sys_var_ulonglong Sys_max_thread_mem(
static Sys_var_sesvartrack Sys_track_session_sys_vars( static Sys_var_sesvartrack Sys_track_session_sys_vars(
"session_track_system_variables", "session_track_system_variables",
"Track changes in registered system variables. " "Track changes in registered system variables. ",
"For compatibility with MySQL defaults this variable should be set to "
"\"autocommit, character_set_client, character_set_connection, "
"character_set_results, time_zone\"",
CMD_LINE(REQUIRED_ARG), IN_SYSTEM_CHARSET, CMD_LINE(REQUIRED_ARG), IN_SYSTEM_CHARSET,
DEFAULT(""), DEFAULT("autocommit,character_set_client,character_set_connection,"
"character_set_results,time_zone"),
NO_MUTEX_GUARD); NO_MUTEX_GUARD);
static bool update_session_track_schema(sys_var *self, THD *thd, static bool update_session_track_schema(sys_var *self, THD *thd,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7