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

after-merge fixes for test cases

Browse Source
This commit is contained in:
Sergei Golubchik
2015-02-06 20:18:40 +01:00
parent 2a1470a0ed
commit 3b267eb646
6 changed files with 27 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mysql-test/suite/sys_vars/r/sysvars_wsrep.result
View File

@@ -22,7 +22,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE OFF DEFAULT_VALUE OFF
VARIABLE_SCOPE SESSION VARIABLE_SCOPE SESSION
VARIABLE_TYPE BOOLEAN VARIABLE_TYPE BOOLEAN
VARIABLE_COMMENT (DEPRECATED) Setting this variable is equivalent to setting wsrep_sync_wait READ flag VARIABLE_COMMENT Setting this variable is equivalent to setting wsrep_sync_wait READ flag
NUMERIC_MIN_VALUE NULL NUMERIC_MIN_VALUE NULL
NUMERIC_MAX_VALUE NULL NUMERIC_MAX_VALUE NULL
NUMERIC_BLOCK_SIZE NULL NUMERIC_BLOCK_SIZE NULL
@@ -87,9 +87,9 @@ READ_ONLY NO
COMMAND_LINE_ARGUMENT OPTIONAL COMMAND_LINE_ARGUMENT OPTIONAL
VARIABLE_NAME WSREP_DATA_HOME_DIR VARIABLE_NAME WSREP_DATA_HOME_DIR
SESSION_VALUE NULL SESSION_VALUE NULL
GLOBAL_VALUE GLOBAL_VALUE DATADIR
GLOBAL_VALUE_ORIGIN COMPILE-TIME GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE DEFAULT_VALUE DATADIR
VARIABLE_SCOPE GLOBAL VARIABLE_SCOPE GLOBAL
VARIABLE_TYPE VARCHAR VARIABLE_TYPE VARCHAR
VARIABLE_COMMENT home directory for wsrep provider VARIABLE_COMMENT home directory for wsrep provider

14
mysql-test/suite/sys_vars/r/wsrep_causal_reads_basic.result
View File

@@ -14,22 +14,32 @@ SELECT @@session.wsrep_causal_reads;
# scope and valid values # scope and valid values
SET @@global.wsrep_causal_reads=OFF; SET @@global.wsrep_causal_reads=OFF;
Warnings:
Warning 1287 '@@wsrep_causal_reads' is deprecated and will be removed in a future release. Please use '@@wsrep_sync_wait=1' instead
SELECT @@global.wsrep_causal_reads; SELECT @@global.wsrep_causal_reads;
@@global.wsrep_causal_reads @@global.wsrep_causal_reads
0 0
SET @@global.wsrep_causal_reads=ON; SET @@global.wsrep_causal_reads=ON;
Warnings:
Warning 1287 '@@wsrep_causal_reads' is deprecated and will be removed in a future release. Please use '@@wsrep_sync_wait=1' instead
SELECT @@global.wsrep_causal_reads; SELECT @@global.wsrep_causal_reads;
@@global.wsrep_causal_reads @@global.wsrep_causal_reads
1 1
SET @@session.wsrep_causal_reads=OFF; SET @@session.wsrep_causal_reads=OFF;
Warnings:
Warning 1287 '@@wsrep_causal_reads' is deprecated and will be removed in a future release. Please use '@@wsrep_sync_wait=1' instead
SELECT @@session.wsrep_causal_reads; SELECT @@session.wsrep_causal_reads;
@@session.wsrep_causal_reads @@session.wsrep_causal_reads
0 0
SET @@session.wsrep_causal_reads=ON; SET @@session.wsrep_causal_reads=ON;
Warnings:
Warning 1287 '@@wsrep_causal_reads' is deprecated and will be removed in a future release. Please use '@@wsrep_sync_wait=1' instead
SELECT @@session.wsrep_causal_reads; SELECT @@session.wsrep_causal_reads;
@@session.wsrep_causal_reads @@session.wsrep_causal_reads
1 1
SET @@session.wsrep_causal_reads=default; SET @@session.wsrep_causal_reads=default;
Warnings:
Warning 1287 '@@wsrep_causal_reads' is deprecated and will be removed in a future release. Please use '@@wsrep_sync_wait=1' instead
SELECT @@session.wsrep_causal_reads; SELECT @@session.wsrep_causal_reads;
@@session.wsrep_causal_reads @@session.wsrep_causal_reads
1 1
@@ -46,5 +56,9 @@ ERROR 42000: Variable 'wsrep_causal_reads' can't be set to the value of 'junk'
# restore the initial values # restore the initial values
SET @@global.wsrep_causal_reads = @wsrep_causal_reads_global_saved; SET @@global.wsrep_causal_reads = @wsrep_causal_reads_global_saved;
Warnings:
Warning 1287 '@@wsrep_causal_reads' is deprecated and will be removed in a future release. Please use '@@wsrep_sync_wait=1' instead
SET @@session.wsrep_causal_reads = @wsrep_causal_reads_session_saved; SET @@session.wsrep_causal_reads = @wsrep_causal_reads_session_saved;
Warnings:
Warning 1287 '@@wsrep_causal_reads' is deprecated and will be removed in a future release. Please use '@@wsrep_sync_wait=1' instead
# End of test # End of test

30
mysql-test/suite/sys_vars/r/wsrep_data_home_dir_basic.result
View File

@@ -4,45 +4,21 @@
# default # default
SELECT @@global.wsrep_data_home_dir; SELECT @@global.wsrep_data_home_dir;
@@global.wsrep_data_home_dir @@global.wsrep_data_home_dir
DATADIR
# scope # scope
SELECT @@session.wsrep_data_home_dir; SELECT @@session.wsrep_data_home_dir;
ERROR HY000: Variable 'wsrep_data_home_dir' is a GLOBAL variable ERROR HY000: Variable 'wsrep_data_home_dir' is a GLOBAL variable
SET @@global.wsrep_data_home_dir='/tmp/data';
ERROR HY000: Variable 'wsrep_data_home_dir' is a read only variable
SELECT @@global.wsrep_data_home_dir;
@@global.wsrep_data_home_dir
# valid values # valid values
SET @@global.wsrep_data_home_dir='/tmp/data'; SET @@global.wsrep_data_home_dir='/tmp/data';
ERROR HY000: Variable 'wsrep_data_home_dir' is a read only variable ERROR HY000: Variable 'wsrep_data_home_dir' is a read only variable
SELECT @@global.wsrep_data_home_dir; SELECT @@global.wsrep_data_home_dir;
@@global.wsrep_data_home_dir @@global.wsrep_data_home_dir
DATADIR
SET @@global.wsrep_data_home_dir=junk-dir;
ERROR HY000: Variable 'wsrep_data_home_dir' is a read only variable
SELECT @@global.wsrep_data_home_dir;
@@global.wsrep_data_home_dir
SET @@global.wsrep_data_home_dir=junk/dir;
ERROR HY000: Variable 'wsrep_data_home_dir' is a read only variable
SELECT @@global.wsrep_data_home_dir;
@@global.wsrep_data_home_dir
SET @@global.wsrep_data_home_dir=OFF;
ERROR HY000: Variable 'wsrep_data_home_dir' is a read only variable
SELECT @@global.wsrep_data_home_dir;
@@global.wsrep_data_home_dir
SET @@global.wsrep_data_home_dir=default; SET @@global.wsrep_data_home_dir=default;
ERROR HY000: Variable 'wsrep_data_home_dir' is a read only variable ERROR HY000: Variable 'wsrep_data_home_dir' is a read only variable
SELECT @@global.wsrep_data_home_dir; SELECT @@global.wsrep_data_home_dir;
@@global.wsrep_data_home_dir @@global.wsrep_data_home_dir
DATADIR
# invalid values
SET @@global.wsrep_data_home_dir=NULL;
ERROR HY000: Variable 'wsrep_data_home_dir' is a read only variable
# End of test # End of test

2
mysql-test/suite/sys_vars/t/sysvars_wsrep.test
View File

@@ -1,6 +1,8 @@
--source include/have_wsrep.inc --source include/have_wsrep.inc
--source include/word_size.inc --source include/word_size.inc
--let $datadir = `SELECT @@datadir`
--replace_result $datadir DATADIR
--vertical_results --vertical_results
select * from information_schema.system_variables select * from information_schema.system_variables
where variable_name like 'wsrep%' where variable_name like 'wsrep%'

21
mysql-test/suite/sys_vars/t/wsrep_data_home_dir_basic.test
View File

@@ -1,41 +1,28 @@
--source include/have_wsrep.inc --source include/have_wsrep.inc
--let $datadir = `SELECT @@datadir`
--echo # --echo #
--echo # wsrep_data_home_dir (readonly) --echo # wsrep_data_home_dir (readonly)
--echo # --echo #
--echo # default --echo # default
--replace_result $datadir DATADIR
SELECT @@global.wsrep_data_home_dir; SELECT @@global.wsrep_data_home_dir;
--echo --echo
--echo # scope --echo # scope
--error ER_INCORRECT_GLOBAL_LOCAL_VAR --error ER_INCORRECT_GLOBAL_LOCAL_VAR
SELECT @@session.wsrep_data_home_dir; SELECT @@session.wsrep_data_home_dir;
--error ER_INCORRECT_GLOBAL_LOCAL_VAR
SET @@global.wsrep_data_home_dir='/tmp/data';
SELECT @@global.wsrep_data_home_dir;
--echo --echo
--echo # valid values --echo # valid values
--error ER_INCORRECT_GLOBAL_LOCAL_VAR --error ER_INCORRECT_GLOBAL_LOCAL_VAR
SET @@global.wsrep_data_home_dir='/tmp/data'; SET @@global.wsrep_data_home_dir='/tmp/data';
SELECT @@global.wsrep_data_home_dir; --replace_result $datadir DATADIR
--error ER_INCORRECT_GLOBAL_LOCAL_VAR
SET @@global.wsrep_data_home_dir=junk-dir;
SELECT @@global.wsrep_data_home_dir;
--error ER_INCORRECT_GLOBAL_LOCAL_VAR
SET @@global.wsrep_data_home_dir=junk/dir;
SELECT @@global.wsrep_data_home_dir;
--error ER_INCORRECT_GLOBAL_LOCAL_VAR
SET @@global.wsrep_data_home_dir=OFF;
SELECT @@global.wsrep_data_home_dir; SELECT @@global.wsrep_data_home_dir;
--error ER_INCORRECT_GLOBAL_LOCAL_VAR --error ER_INCORRECT_GLOBAL_LOCAL_VAR
SET @@global.wsrep_data_home_dir=default; SET @@global.wsrep_data_home_dir=default;
--replace_result $datadir DATADIR
SELECT @@global.wsrep_data_home_dir; SELECT @@global.wsrep_data_home_dir;
--echo
--echo # invalid values
--error ER_INCORRECT_GLOBAL_LOCAL_VAR
SET @@global.wsrep_data_home_dir=NULL;
--echo # End of test --echo # End of test

4
sql/sys_vars.cc
View File

@@ -984,10 +984,8 @@ static bool check_master_connection(sys_var *self, THD *thd, set_var *var)
tmp.str= var->save_result.string_value.str; tmp.str= var->save_result.string_value.str;
tmp.length= var->save_result.string_value.length; tmp.length= var->save_result.string_value.length;
if (!tmp.str || check_master_connection_name(&tmp)) if (!tmp.str || check_master_connection_name(&tmp))
{
my_error(ER_WRONG_ARGUMENTS, MYF(0), var->var->name.str);
return true; return true;
}
return false; return false;
} }