diff options
author | Sergei Golubchik <serg@mariadb.org> | 2018-03-25 13:02:52 +0200 |
---|---|---|
committer | Sergei Golubchik <serg@mariadb.org> | 2018-03-25 13:02:52 +0200 |
commit | c764bc0a78e9359fa208e074bd327f7a852c7cb7 (patch) | |
tree | eeb5d56d225d1fdf97a016c3eae7b93c4e1f6927 /mysql-test/suite/sys_vars | |
parent | d702e463902bca7d94ff8a1a49468a5b7bdb4ba0 (diff) | |
parent | 15795b9f9a850d9587f17ef18e1ac7b5af31ec1e (diff) | |
download | mariadb-git-c764bc0a78e9359fa208e074bd327f7a852c7cb7.tar.gz |
Merge branch '10.1' into 10.2
Diffstat (limited to 'mysql-test/suite/sys_vars')
-rw-r--r-- | mysql-test/suite/sys_vars/r/wsrep_sst_receive_address_basic.result | 4 | ||||
-rw-r--r-- | mysql-test/suite/sys_vars/t/wsrep_sst_receive_address_basic.test | 4 |
2 files changed, 0 insertions, 8 deletions
diff --git a/mysql-test/suite/sys_vars/r/wsrep_sst_receive_address_basic.result b/mysql-test/suite/sys_vars/r/wsrep_sst_receive_address_basic.result index 6db52eb8150..3e1fb6cad79 100644 --- a/mysql-test/suite/sys_vars/r/wsrep_sst_receive_address_basic.result +++ b/mysql-test/suite/sys_vars/r/wsrep_sst_receive_address_basic.result @@ -30,10 +30,6 @@ SELECT @@global.wsrep_sst_receive_address; 192.168.2.254 # invalid values -SET @@global.wsrep_sst_receive_address='127.0.0.1:4444'; -ERROR 42000: Variable 'wsrep_sst_receive_address' can't be set to the value of '127.0.0.1:4444' -SET @@global.wsrep_sst_receive_address='127.0.0.1'; -ERROR 42000: Variable 'wsrep_sst_receive_address' can't be set to the value of '127.0.0.1' SELECT @@global.wsrep_sst_receive_address; @@global.wsrep_sst_receive_address 192.168.2.254 diff --git a/mysql-test/suite/sys_vars/t/wsrep_sst_receive_address_basic.test b/mysql-test/suite/sys_vars/t/wsrep_sst_receive_address_basic.test index 9e50cbf8947..59f69c14dfb 100644 --- a/mysql-test/suite/sys_vars/t/wsrep_sst_receive_address_basic.test +++ b/mysql-test/suite/sys_vars/t/wsrep_sst_receive_address_basic.test @@ -27,10 +27,6 @@ SELECT @@global.wsrep_sst_receive_address; --echo --echo # invalid values ---error ER_WRONG_VALUE_FOR_VAR -SET @@global.wsrep_sst_receive_address='127.0.0.1:4444'; ---error ER_WRONG_VALUE_FOR_VAR -SET @@global.wsrep_sst_receive_address='127.0.0.1'; SELECT @@global.wsrep_sst_receive_address; --error ER_WRONG_VALUE_FOR_VAR SET @@global.wsrep_sst_receive_address=NULL; |