Skip to content

Commit 3b267eb

Browse files
vuvovavuvova
committed
after-merge fixes for test cases
1 parent 2a1470a commit 3b267eb

File tree

6 files changed

+27
-50
lines changed

6 files changed

+27
-50
lines changed

‎mysql-test/suite/sys_vars/r/sysvars_wsrep.result

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME
2222
DEFAULT_VALUE OFF
2323
VARIABLE_SCOPE SESSION
2424
VARIABLE_TYPE BOOLEAN
25-
VARIABLE_COMMENT (DEPRECATED) Setting this variable is equivalent to setting wsrep_sync_wait READ flag
25+
VARIABLE_COMMENT Setting this variable is equivalent to setting wsrep_sync_wait READ flag
2626
NUMERIC_MIN_VALUE NULL
2727
NUMERIC_MAX_VALUE NULL
2828
NUMERIC_BLOCK_SIZE NULL
@@ -87,9 +87,9 @@ READ_ONLY NO
8787
COMMAND_LINE_ARGUMENT OPTIONAL
8888
VARIABLE_NAME WSREP_DATA_HOME_DIR
8989
SESSION_VALUE NULL
90-
GLOBAL_VALUE
90+
GLOBAL_VALUE DATADIR
9191
GLOBAL_VALUE_ORIGIN COMPILE-TIME
92-
DEFAULT_VALUE
92+
DEFAULT_VALUE DATADIR
9393
VARIABLE_SCOPE GLOBAL
9494
VARIABLE_TYPE VARCHAR
9595
VARIABLE_COMMENT home directory for wsrep provider

‎mysql-test/suite/sys_vars/r/wsrep_causal_reads_basic.result

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,22 +14,32 @@ SELECT @@session.wsrep_causal_reads;
1414

1515
# scope and valid values
1616
SET @@global.wsrep_causal_reads=OFF;
17+
Warnings:
18+
Warning 1287 '@@wsrep_causal_reads' is deprecated and will be removed in a future release. Please use '@@wsrep_sync_wait=1' instead
1719
SELECT @@global.wsrep_causal_reads;
1820
@@global.wsrep_causal_reads
1921
0
2022
SET @@global.wsrep_causal_reads=ON;
23+
Warnings:
24+
Warning 1287 '@@wsrep_causal_reads' is deprecated and will be removed in a future release. Please use '@@wsrep_sync_wait=1' instead
2125
SELECT @@global.wsrep_causal_reads;
2226
@@global.wsrep_causal_reads
2327
1
2428
SET @@session.wsrep_causal_reads=OFF;
29+
Warnings:
30+
Warning 1287 '@@wsrep_causal_reads' is deprecated and will be removed in a future release. Please use '@@wsrep_sync_wait=1' instead
2531
SELECT @@session.wsrep_causal_reads;
2632
@@session.wsrep_causal_reads
2733
0
2834
SET @@session.wsrep_causal_reads=ON;
35+
Warnings:
36+
Warning 1287 '@@wsrep_causal_reads' is deprecated and will be removed in a future release. Please use '@@wsrep_sync_wait=1' instead
2937
SELECT @@session.wsrep_causal_reads;
3038
@@session.wsrep_causal_reads
3139
1
3240
SET @@session.wsrep_causal_reads=default;
41+
Warnings:
42+
Warning 1287 '@@wsrep_causal_reads' is deprecated and will be removed in a future release. Please use '@@wsrep_sync_wait=1' instead
3343
SELECT @@session.wsrep_causal_reads;
3444
@@session.wsrep_causal_reads
3545
1
@@ -46,5 +56,9 @@ ERROR 42000: Variable 'wsrep_causal_reads' can't be set to the value of 'junk'
4656

4757
# restore the initial values
4858
SET @@global.wsrep_causal_reads = @wsrep_causal_reads_global_saved;
59+
Warnings:
60+
Warning 1287 '@@wsrep_causal_reads' is deprecated and will be removed in a future release. Please use '@@wsrep_sync_wait=1' instead
4961
SET @@session.wsrep_causal_reads = @wsrep_causal_reads_session_saved;
62+
Warnings:
63+
Warning 1287 '@@wsrep_causal_reads' is deprecated and will be removed in a future release. Please use '@@wsrep_sync_wait=1' instead
5064
# End of test

‎mysql-test/suite/sys_vars/r/wsrep_data_home_dir_basic.result

Lines changed: 3 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -4,45 +4,21 @@
44
# default
55
SELECT @@global.wsrep_data_home_dir;
66
@@global.wsrep_data_home_dir
7-
7+
DATADIR
88

99
# scope
1010
SELECT @@session.wsrep_data_home_dir;
1111
ERROR HY000: Variable 'wsrep_data_home_dir' is a GLOBAL variable
12-
SET @@global.wsrep_data_home_dir='/tmp/data';
13-
ERROR HY000: Variable 'wsrep_data_home_dir' is a read only variable
14-
SELECT @@global.wsrep_data_home_dir;
15-
@@global.wsrep_data_home_dir
16-
1712

1813
# valid values
1914
SET @@global.wsrep_data_home_dir='/tmp/data';
2015
ERROR HY000: Variable 'wsrep_data_home_dir' is a read only variable
2116
SELECT @@global.wsrep_data_home_dir;
2217
@@global.wsrep_data_home_dir
23-
24-
SET @@global.wsrep_data_home_dir=junk-dir;
25-
ERROR HY000: Variable 'wsrep_data_home_dir' is a read only variable
26-
SELECT @@global.wsrep_data_home_dir;
27-
@@global.wsrep_data_home_dir
28-
29-
SET @@global.wsrep_data_home_dir=junk/dir;
30-
ERROR HY000: Variable 'wsrep_data_home_dir' is a read only variable
31-
SELECT @@global.wsrep_data_home_dir;
32-
@@global.wsrep_data_home_dir
33-
34-
SET @@global.wsrep_data_home_dir=OFF;
35-
ERROR HY000: Variable 'wsrep_data_home_dir' is a read only variable
36-
SELECT @@global.wsrep_data_home_dir;
37-
@@global.wsrep_data_home_dir
38-
18+
DATADIR
3919
SET @@global.wsrep_data_home_dir=default;
4020
ERROR HY000: Variable 'wsrep_data_home_dir' is a read only variable
4121
SELECT @@global.wsrep_data_home_dir;
4222
@@global.wsrep_data_home_dir
43-
44-
45-
# invalid values
46-
SET @@global.wsrep_data_home_dir=NULL;
47-
ERROR HY000: Variable 'wsrep_data_home_dir' is a read only variable
23+
DATADIR
4824
# End of test

‎mysql-test/suite/sys_vars/t/sysvars_wsrep.test

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
--source include/have_wsrep.inc
22
--source include/word_size.inc
3+
--let $datadir = `SELECT @@datadir`
34

5+
--replace_result $datadir DATADIR
46
--vertical_results
57
select * from information_schema.system_variables
68
where variable_name like 'wsrep%'

‎mysql-test/suite/sys_vars/t/wsrep_data_home_dir_basic.test

Lines changed: 4 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,28 @@
11
--source include/have_wsrep.inc
2+
--let $datadir = `SELECT @@datadir`
23

34
--echo #
45
--echo # wsrep_data_home_dir (readonly)
56
--echo #
67

78
--echo # default
9+
--replace_result $datadir DATADIR
810
SELECT @@global.wsrep_data_home_dir;
911

1012
--echo
1113
--echo # scope
1214
--error ER_INCORRECT_GLOBAL_LOCAL_VAR
1315
SELECT @@session.wsrep_data_home_dir;
14-
--error ER_INCORRECT_GLOBAL_LOCAL_VAR
15-
SET @@global.wsrep_data_home_dir='/tmp/data';
16-
SELECT @@global.wsrep_data_home_dir;
1716

1817
--echo
1918
--echo # valid values
2019
--error ER_INCORRECT_GLOBAL_LOCAL_VAR
2120
SET @@global.wsrep_data_home_dir='/tmp/data';
22-
SELECT @@global.wsrep_data_home_dir;
23-
--error ER_INCORRECT_GLOBAL_LOCAL_VAR
24-
SET @@global.wsrep_data_home_dir=junk-dir;
25-
SELECT @@global.wsrep_data_home_dir;
26-
--error ER_INCORRECT_GLOBAL_LOCAL_VAR
27-
SET @@global.wsrep_data_home_dir=junk/dir;
28-
SELECT @@global.wsrep_data_home_dir;
29-
--error ER_INCORRECT_GLOBAL_LOCAL_VAR
30-
SET @@global.wsrep_data_home_dir=OFF;
21+
--replace_result $datadir DATADIR
3122
SELECT @@global.wsrep_data_home_dir;
3223
--error ER_INCORRECT_GLOBAL_LOCAL_VAR
3324
SET @@global.wsrep_data_home_dir=default;
25+
--replace_result $datadir DATADIR
3426
SELECT @@global.wsrep_data_home_dir;
3527

36-
--echo
37-
--echo # invalid values
38-
--error ER_INCORRECT_GLOBAL_LOCAL_VAR
39-
SET @@global.wsrep_data_home_dir=NULL;
40-
4128
--echo # End of test

‎sql/sys_vars.cc

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -984,10 +984,8 @@ static bool check_master_connection(sys_var *self, THD *thd, set_var *var)
984984
tmp.str= var->save_result.string_value.str;
985985
tmp.length= var->save_result.string_value.length;
986986
if (!tmp.str || check_master_connection_name(&tmp))
987-
{
988-
my_error(ER_WRONG_ARGUMENTS, MYF(0), var->var->name.str);
989987
return true;
990-
}
988+
991989
return false;
992990
}
993991

0 commit comments

Comments
 (0)