- commits - lists.mariadb.org

[Commits] fd154c03: Revert libopenssl-1_0_0-devel build requirement, package is not
by jan 12 Sep '18

12 Sep '18

revision-id: fd154c03b20a165b7a8f628d8687a8280981aa4c (mariadb-25.3.19-13-gfd154c03) parent(s): 13c628e4d49cb76947c8168d686e6b52d77ee761 author: Jan Lindström committer: Jan Lindström timestamp: 2018-09-13 07:33:29 +0300 message: Revert libopenssl-1_0_0-devel build requirement, package is not found mostly. Need release dependent build requirement. --- scripts/packages/galera.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/packages/galera.spec b/scripts/packages/galera.spec index 67628ad1..33cec5b2 100644 --- a/scripts/packages/galera.spec +++ b/scripts/packages/galera.spec @@ -59,7 +59,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version} #BuildRequires: boost-devel #BuildRequires: check-devel BuildRequires: glibc-devel -BuildRequires: libopenssl-1_0_0-devel +BuildRequires: openssl-devel BuildRequires: scons %if 0%{?suse_version} == 1110 # On SLES11 SPx use the linked gcc47 to build instead of default gcc43

1 0

[Commits] a933630: MDEV-17018 JSON_SEARCH and User-Defined Variables.
by holyfoot＠askmonty.org 12 Sep '18

12 Sep '18

revision-id: a93363022ccdb66846f2fc87b630ebdf4184b45d (mariadb-10.2.16-130-ga933630) parent(s): c3124174c3ec43836147003a78af5d55bd624151 committer: Alexey Botchkov timestamp: 2018-09-12 21:57:28 +0400 message: MDEV-17018 JSON_SEARCH and User-Defined Variables. Item_func_json_search needs a member to store the path. --- mysql-test/r/func_json.result | 8 ++++++++ mysql-test/t/func_json.test | 8 ++++++++ sql/item_jsonfunc.cc | 2 +- sql/item_jsonfunc.h | 2 +- 4 files changed, 18 insertions(+), 2 deletions(-) diff --git a/mysql-test/r/func_json.result b/mysql-test/r/func_json.result index 9c7a106..6ba4ed7 100644 --- a/mysql-test/r/func_json.result +++ b/mysql-test/r/func_json.result @@ -796,3 +796,11 @@ JSON_SET('{}', '$.a', _utf8 X'C3B6', '$.x', 1, '$.b', _utf8 X'C3B6') select json_array_append('[ ]', '$', 'aue'); json_array_append('[ ]', '$', 'aue') ["aue"] +# +# MDEV-17018 JSON_SEARCH and User-Defined Variables. +# +SET @`json` := '["A", [{"B": "1"}], {"C": "AB"}, {"D": "BC"}]', @`value` := 'AB'; +SELECT JSON_SEARCH(@`json`, 'one', @`value`); +JSON_SEARCH(@`json`, 'one', @`value`) +"$[2].C" +SET @`json` := NULL, @`value` := NULL; diff --git a/mysql-test/t/func_json.test b/mysql-test/t/func_json.test index e27128a..0790ea2 100644 --- a/mysql-test/t/func_json.test +++ b/mysql-test/t/func_json.test @@ -455,3 +455,11 @@ SELECT JSON_SET('{}', '$.a', _utf8 X'C3B6', '$.x', 1, '$.b', _utf8 X'C3B6'); select json_array_append('[ ]', '$', 'aue'); +--echo # +--echo # MDEV-17018 JSON_SEARCH and User-Defined Variables. +--echo # + +SET @`json` := '["A", [{"B": "1"}], {"C": "AB"}, {"D": "BC"}]', @`value` := 'AB'; +SELECT JSON_SEARCH(@`json`, 'one', @`value`); +SET @`json` := NULL, @`value` := NULL; + diff --git a/sql/item_jsonfunc.cc b/sql/item_jsonfunc.cc index 1da5393..4cb7974 100644 --- a/sql/item_jsonfunc.cc +++ b/sql/item_jsonfunc.cc @@ -3056,7 +3056,7 @@ static int append_json_path(String *str, const json_path_t *p) String *Item_func_json_search::val_str(String *str) { String *js= args[0]->val_json(&tmp_js); - String *s_str= args[2]->val_str(&tmp_js); + String *s_str= args[2]->val_str(&tmp_path); json_engine_t je; json_path_t p, sav_path; uint n_arg; diff --git a/sql/item_jsonfunc.h b/sql/item_jsonfunc.h index f331ee3..f235816 100644 --- a/sql/item_jsonfunc.h +++ b/sql/item_jsonfunc.h @@ -400,7 +400,7 @@ class Item_func_json_keys: public Item_str_func class Item_func_json_search: public Item_json_str_multipath { protected: - String tmp_js, esc_value; + String tmp_js, tmp_path, esc_value; bool mode_one; bool ooa_constant, ooa_parsed; int escape;

1 0

[Commits] 3c7e2540f63: MDEV-17020: Assertion `length > 0' failed in ptr_compare upon ORDER BY with bad conversion
by Varun 12 Sep '18

12 Sep '18

revision-id: 3c7e2540f63c6801a0d0a27fbea7c934bb61221f (mariadb-10.0.36-13-g3c7e2540f63) parent(s): b3c320bb0b93e516cda4db277cfa3efeef48c988 author: Varun Gupta committer: Varun Gupta timestamp: 2018-08-31 00:14:20 +0530 message: MDEV-17020: Assertion `length > 0' failed in ptr_compare upon ORDER BY with bad conversion We have a case here where the the entire sort key is empty and so sorting is not needed. The crash happens because filesort expects the sort key to have length > 0. The case here is like ORDER BY CONVERT(a,char(0)), which if evaluated is a constant so can be removed from the ORDER BY clause --- mysql-test/r/order_by_zerolength-4285.result | 28 +++++++++++++++++----------- mysql-test/t/order_by_zerolength-4285.test | 13 +++++++++++++ sql/item_timefunc.h | 6 ++++++ 3 files changed, 36 insertions(+), 11 deletions(-) diff --git a/mysql-test/r/order_by_zerolength-4285.result b/mysql-test/r/order_by_zerolength-4285.result index f60ce7d90c7..f77b284df3c 100644 --- a/mysql-test/r/order_by_zerolength-4285.result +++ b/mysql-test/r/order_by_zerolength-4285.result @@ -12,15 +12,21 @@ pk 8 9 10 -Warnings: -Warning 1292 Truncated incorrect CHAR(0) value: '1' -Warning 1292 Truncated incorrect CHAR(0) value: '2' -Warning 1292 Truncated incorrect CHAR(0) value: '3' -Warning 1292 Truncated incorrect CHAR(0) value: '4' -Warning 1292 Truncated incorrect CHAR(0) value: '5' -Warning 1292 Truncated incorrect CHAR(0) value: '6' -Warning 1292 Truncated incorrect CHAR(0) value: '7' -Warning 1292 Truncated incorrect CHAR(0) value: '8' -Warning 1292 Truncated incorrect CHAR(0) value: '9' -Warning 1292 Truncated incorrect CHAR(0) value: '10' +drop table t1; +# +# MDEV-17020: Assertion `length > 0' failed in ptr_compare upon ORDER BY with bad conversion +# +set @save_sql_mode= @@sql_mode; +SET @@sql_mode= ''; +CREATE TABLE t1 (pk INT PRIMARY KEY); +INSERT INTO t1 VALUES (1),(2); +explain +SELECT * FROM t1 ORDER BY 'foo', CONVERT(pk, CHAR(0)) LIMIT 2; +id select_type table type possible_keys key key_len ref rows Extra +1 SIMPLE t1 index NULL PRIMARY 4 NULL 2 Using index +SELECT * FROM t1 ORDER BY 'foo', Cast(pk as CHAR(0)) LIMIT 2; +pk +1 +2 +set @@sql_mode= @save_sql_mode; drop table t1; diff --git a/mysql-test/t/order_by_zerolength-4285.test b/mysql-test/t/order_by_zerolength-4285.test index 2fb58edd36d..f03d528320c 100644 --- a/mysql-test/t/order_by_zerolength-4285.test +++ b/mysql-test/t/order_by_zerolength-4285.test @@ -6,3 +6,16 @@ insert into t1 values (1),(2),(3),(4),(5),(6),(7),(8),(9),(10); select * from t1 order by now(), cast(pk as char(0)); drop table t1; +--echo # +--echo # MDEV-17020: Assertion `length > 0' failed in ptr_compare upon ORDER BY with bad conversion +--echo # + +set @save_sql_mode= @@sql_mode; +SET @@sql_mode= ''; +CREATE TABLE t1 (pk INT PRIMARY KEY); +INSERT INTO t1 VALUES (1),(2); +explain +SELECT * FROM t1 ORDER BY 'foo', CONVERT(pk, CHAR(0)) LIMIT 2; +SELECT * FROM t1 ORDER BY 'foo', Cast(pk as CHAR(0)) LIMIT 2; +set @@sql_mode= @save_sql_mode; +drop table t1; diff --git a/sql/item_timefunc.h b/sql/item_timefunc.h index 80b98758fb7..461c3feed8c 100644 --- a/sql/item_timefunc.h +++ b/sql/item_timefunc.h @@ -903,6 +903,12 @@ class Item_char_typecast :public Item_str_func String *val_str(String *a); void fix_length_and_dec(); void print(String *str, enum_query_type query_type); + table_map used_tables() const + { + if (!cast_length) + return (table_map) 0L; + return Item_str_func::used_tables(); + } };

2 1

[Commits] 13c628e4: Correct build requirement.
by jan 12 Sep '18

12 Sep '18

revision-id: 13c628e4d49cb76947c8168d686e6b52d77ee761 (mariadb-25.3.19-12-g13c628e4) parent(s): a8cb4aafe955e69d5f1435e04e109b1e265cc446 author: Jan Lindström committer: Jan Lindström timestamp: 2018-09-12 17:15:29 +0300 message: Correct build requirement. --- scripts/packages/galera.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/packages/galera.spec b/scripts/packages/galera.spec index 33cec5b2..67628ad1 100644 --- a/scripts/packages/galera.spec +++ b/scripts/packages/galera.spec @@ -59,7 +59,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version} #BuildRequires: boost-devel #BuildRequires: check-devel BuildRequires: glibc-devel -BuildRequires: openssl-devel +BuildRequires: libopenssl-1_0_0-devel BuildRequires: scons %if 0%{?suse_version} == 1110 # On SLES11 SPx use the linked gcc47 to build instead of default gcc43

1 0

[Commits] 038804d5945: Update disabled Galera tests.
by jan 12 Sep '18

12 Sep '18

revision-id: 038804d59452f1c6b1569b10278eb865d81fa184 (mariadb-10.1.35-50-g038804d5945) parent(s): 794e89ed3f92ef0468a95707e89322d2172357d2 author: Jan Lindström committer: Jan Lindström timestamp: 2018-09-12 14:56:48 +0300 message: Update disabled Galera tests. --- mysql-test/suite/galera/disabled.def | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/mysql-test/suite/galera/disabled.def b/mysql-test/suite/galera/disabled.def index bd9070683d4..c4aa0ad2a74 100644 --- a/mysql-test/suite/galera/disabled.def +++ b/mysql-test/suite/galera/disabled.def @@ -25,11 +25,22 @@ galera_gcache_recover_full_gcache : MDEV-13549 Galera test failures galera_gcache_recover_manytrx : MDEV-13549 Galera test failures galera_ssl_upgrade : MDEV-13549 Galera test failures galera.MW-329 : wsrep_local_replays not stable -galera.MW-328A : have_deadlocks test not stable query_cache : MDEV-15805 Test failure on galera.query_cache MW-416 : MDEV-13549 Galera test failures galera_wan : MDEV-13549 Galera test failures MW-388 : MDEV-13549 Galera test failures galera_sst_mysqldump_with_key : MDEV-16890 Galera test failure -galera.galera_kill_ddl : MDEV-17108 Test failure on galera.galera_kill_ddl +galera_binlog_stmt_autoinc: MDEV-17106 Test failure on galera.galera_binlog_stmt_autoinc +galera_gc_fc_limit : MDEV-17061 Test failure on galera.galera_gc_fc_limit +galera_applier_ftwrl_table_after : MDEV-13738 galera_applier_ftwrl_table_alter may fail with '2006: MySQL server has gone away' +galra_unicode_identifiers: MDEV-13871 galera.galera_unicode_identifiers failed in buildbot with 'Unknown database' +galera_suspend_slave: MDEV-13873 galera.galera_suspend_slave failed in buildbot with wrong error code +MW-328A : MDEV-13876 galera.MW-328A failed in buildbot with wrong result or timeout +galera_wan : MDEV-13879 galera.galera_wan fails in buildbot with Stray state UUID msg or with "Transport endpoint is not connected" or with a failure to start a node +partition : MDEV-13881 galera.partition failed in buildbot with wrong result +galera_transaction_read_only : MDEV-14142 galera.galera_transaction_read_only fails in buildbot with wrong result +galera_kill_smallchanges : MDEV-14143 galera.galera_kill_smallchanges, galera.galera_kill_ddl fail in buildbot with "Last Applied Action message in non-primary configuration from member 0" +MW-328B : MDEV-14145 galera.MW-328B failed in buildbot with a timeout +MW-328C : MDEV-14149 galera.MW-328A, galera.MW-328C failed with "Found wrong usage of mutex" +galera_as_slave_replication_budle : MDEV-15785 Test case galera_as_slave_replication_bundle caused debug assertion

1 0

[Commits] 794e89ed3f9: MDEV-17108: Test failure on galera.galera_kill_ddl
by jan 12 Sep '18

12 Sep '18

revision-id: 794e89ed3f92ef0468a95707e89322d2172357d2 (mariadb-10.1.35-49-g794e89ed3f9) parent(s): c76ee73dc7b498d02f5de8f40aee2078302c33c4 author: Jan Lindström committer: Jan Lindström timestamp: 2018-09-12 14:54:59 +0300 message: MDEV-17108: Test failure on galera.galera_kill_ddl Add suppression. --- mysql-test/suite/galera/r/galera_kill_ddl.result | 1 + mysql-test/suite/galera/t/galera_kill_ddl.test | 2 ++ 2 files changed, 3 insertions(+) diff --git a/mysql-test/suite/galera/r/galera_kill_ddl.result b/mysql-test/suite/galera/r/galera_kill_ddl.result index b83226bbd42..bf192500f17 100644 --- a/mysql-test/suite/galera/r/galera_kill_ddl.result +++ b/mysql-test/suite/galera/r/galera_kill_ddl.result @@ -1,3 +1,4 @@ +call mtr.add_suppression("WSREP: Last Applied Action message in non-primary configuration from member .*"); SET GLOBAL wsrep_provider_options = 'pc.ignore_sb=true'; CREATE TABLE t1 (f1 INTEGER) ENGINE=InnoDB; Killing server ... diff --git a/mysql-test/suite/galera/t/galera_kill_ddl.test b/mysql-test/suite/galera/t/galera_kill_ddl.test index 90f3f30cc76..ca59264ced4 100644 --- a/mysql-test/suite/galera/t/galera_kill_ddl.test +++ b/mysql-test/suite/galera/t/galera_kill_ddl.test @@ -5,6 +5,8 @@ --source include/galera_cluster.inc --source include/have_innodb.inc +call mtr.add_suppression("WSREP: Last Applied Action message in non-primary configuration from member .*"); + --connection node_1 # Enable the master to continue running during the split-brain situation that

1 0

[Commits] c76ee73dc7b: MDEV-13743: galera_toi_truncate may fail with: query 'reap' succeeded - should have failed with errno 1213
by jan 12 Sep '18

12 Sep '18

revision-id: c76ee73dc7b498d02f5de8f40aee2078302c33c4 (mariadb-10.1.35-48-gc76ee73dc7b) parent(s): 16384fae63ed37e2115cb0d694d817bf0104dd46 author: Jan Lindström committer: Jan Lindström timestamp: 2018-09-12 13:32:14 +0300 message: MDEV-13743: galera_toi_truncate may fail with: query 'reap' succeeded - should have failed with errno 1213 Replace sleep with debug sync point before insert commit to make sure insert is not executed before truncate has started. --- mysql-test/suite/galera/r/galera_toi_truncate.result | 2 ++ mysql-test/suite/galera/t/galera_toi_truncate.test | 16 +++++++++++++--- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/mysql-test/suite/galera/r/galera_toi_truncate.result b/mysql-test/suite/galera/r/galera_toi_truncate.result index f52316f3cbc..fb2ac08d494 100644 --- a/mysql-test/suite/galera/r/galera_toi_truncate.result +++ b/mysql-test/suite/galera/r/galera_toi_truncate.result @@ -2,6 +2,8 @@ CREATE TABLE ten (f1 INTEGER) ENGINE=InnoDB; INSERT INTO ten VALUES (1),(2),(3),(4),(5),(6),(7),(8),(9),(10); CREATE TABLE t1 (f1 INTEGER) ENGINE=InnoDB; SET SESSION wsrep_retry_autocommit = 0; +INSERT INTO t1(f1) SELECT 1 FROM ten as a1, ten AS a2; +set debug_sync='ha_commit_trans_after_prepare WAIT_FOR go'; INSERT INTO t1 (f1) SELECT 1 FROM ten AS a1, ten AS a2, ten AS a3, ten AS a4, ten AS a5, ten AS a6;; TRUNCATE TABLE t1;; ERROR 40001: Deadlock found when trying to get lock; try restarting transaction diff --git a/mysql-test/suite/galera/t/galera_toi_truncate.test b/mysql-test/suite/galera/t/galera_toi_truncate.test index 59ef5c2028f..0c1d0e45e41 100644 --- a/mysql-test/suite/galera/t/galera_toi_truncate.test +++ b/mysql-test/suite/galera/t/galera_toi_truncate.test @@ -5,6 +5,8 @@ --source include/galera_cluster.inc --source include/have_innodb.inc +--source include/have_debug_sync.inc +--source include/not_embedded.inc # # INSERT and TRUNCATE on different nodes @@ -16,14 +18,23 @@ INSERT INTO ten VALUES (1),(2),(3),(4),(5),(6),(7),(8),(9),(10); CREATE TABLE t1 (f1 INTEGER) ENGINE=InnoDB; -# Insert 100K rows +# Insert 1m rows --connection node_2 +--let $wait_condition = SELECT COUNT(*) = 10 FROM ten; +--source include/wait_condition.inc + # Prevent autocommit retring from masking the deadlock error we expect to get SET SESSION wsrep_retry_autocommit = 0; +INSERT INTO t1(f1) SELECT 1 FROM ten as a1, ten AS a2; + +set debug_sync='ha_commit_trans_after_prepare WAIT_FOR go'; --send INSERT INTO t1 (f1) SELECT 1 FROM ten AS a1, ten AS a2, ten AS a3, ten AS a4, ten AS a5, ten AS a6; --connection node_1 ---sleep 1 +# Wait for a above insert to start +--let $wait_condition = SELECT COUNT(*) >= 100 from t1; +--source include/wait_condition.inc + --send TRUNCATE TABLE t1; --connection node_1 @@ -38,6 +49,5 @@ SELECT COUNT(*) = 0 FROM t1; --connection node_1 SELECT COUNT(*) = 0 FROM t1; - DROP TABLE t1; DROP TABLE ten;

1 0

[Commits] a8cb4aaf: Add SUSE 15.
by jan 12 Sep '18

12 Sep '18

revision-id: a8cb4aafe955e69d5f1435e04e109b1e265cc446 (mariadb-25.3.19-11-ga8cb4aaf) parent(s): b57c7363abe8b353211fcf4cecda19accc37f29d author: Jan Lindström committer: Jan Lindström timestamp: 2018-09-12 12:31:03 +0300 message: Add SUSE 15. --- scripts/packages/galera.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/packages/galera.spec b/scripts/packages/galera.spec index a5caaa30..33cec5b2 100644 --- a/scripts/packages/galera.spec +++ b/scripts/packages/galera.spec @@ -39,7 +39,9 @@ %if 0%{?suse_version} == 1320 %define dist .suse13.2 %endif - +%if 0%{?suse_version} == 1500 +%define dist .suse15.0 +%endif Name: %{name} Summary: Galera: a synchronous multi-master wsrep provider (replication engine)

1 0

[Commits] 0e5e0ea6772: Fix test galera#505 galera library version check.
by jan 12 Sep '18

12 Sep '18

revision-id: 0e5e0ea67724d144f38d4c1b10bb95e86c48a579 (mariadb-10.2.16-128-g0e5e0ea6772) parent(s): e1951723fa45b35c1849416d01162776b6b02838 author: Jan Lindström committer: Jan Lindström timestamp: 2018-09-12 11:25:47 +0300 message: Fix test galera#505 galera library version check. Test requires galera library version 25.3.24. --- mysql-test/suite/galera/t/galera#505.test | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/mysql-test/suite/galera/t/galera#505.test b/mysql-test/suite/galera/t/galera#505.test index 78cdf53db74..785b1411596 100644 --- a/mysql-test/suite/galera/t/galera#505.test +++ b/mysql-test/suite/galera/t/galera#505.test @@ -2,22 +2,16 @@ --source include/galera_cluster.inc ---disable_query_log -select CAST(REGEXP_REPLACE(variable_value,'^(\\d+)\\.(\\d+)\\.(\\d+)(r\\d+)','\\3') AS UNSIGNED) FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME LIKE 'wsrep_provider_version' INTO @GALERA_VERSION; - -# Make sure that the test is operating on the right version of galera library. ---let $galera_version=24 -eval SET @REQUIRED_GALERA_VERSION='$galera_version'; - -SELECT @GALERA_VERSION, @REQUIRED_GALERA_VERSION; +--connection node_1 -if (!`SELECT (@GALERA_VERSION < @REQUIRED_GALERA_VERSION)`) -{ - skip Test requires Galera library version 25.3.$galera_version; -} +SET SESSION wsrep_sync_wait=0; +--disable_result_log +--disable_query_log +--let $galera_version=25.3.24 +source ../../wsrep/include/check_galera_version.inc; +--enable_result_log --enable_query_log - ---connection node_1 +SET SESSION wsrep_sync_wait=DEFAULT; # Convert "... pc.weight = N; ..." to "N; ..." --let $s1 = `SELECT SUBSTR(@@wsrep_provider_options, LOCATE('pc.weight =', @@wsrep_provider_options) + LENGTH('pc.weight = '))`

1 0

[Commits] e1951723fa4: Fix merge error.
by jan 11 Sep '18

11 Sep '18

revision-id: e1951723fa45b35c1849416d01162776b6b02838 (mariadb-10.2.16-127-ge1951723fa4) parent(s): 2062fe42d328c2e12d4c0ebaa2d7b4b727326ae4 author: Jan Lindström committer: Jan Lindström timestamp: 2018-09-12 09:34:09 +0300 message: Fix merge error. --- scripts/wsrep_sst_rsync.sh | 4 ++-- sql/wsrep_mysqld.cc | 6 +----- sql/wsrep_sst.cc | 14 +++++++++++--- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/scripts/wsrep_sst_rsync.sh b/scripts/wsrep_sst_rsync.sh index b754bfb46dd..73b1f4f649d 100644 --- a/scripts/wsrep_sst_rsync.sh +++ b/scripts/wsrep_sst_rsync.sh @@ -190,7 +190,7 @@ fi # --exclude '*.[0-9][0-9][0-9][0-9][0-9][0-9]' --exclude '*.index') # New filter - exclude everything except dirs (schemas) and innodb files -FILTER=(-f '- /lost+found' +FILTER="-f '- /lost+found' -f '- /.fseventsd' -f '- /.Trashes' -f '+ /wsrep_sst_binlog.tar' @@ -198,7 +198,7 @@ FILTER=(-f '- /lost+found' -f '- $INNODB_DATA_HOME_DIR/ibdata*' -f '+ /undo*' -f '+ /*/' - -f '- /*') + -f '- /*'" SSTKEY=$(parse_cnf sst tkey "") SSTCERT=$(parse_cnf sst tcert "") diff --git a/sql/wsrep_mysqld.cc b/sql/wsrep_mysqld.cc index 815804366bc..0ddc4520cee 100644 --- a/sql/wsrep_mysqld.cc +++ b/sql/wsrep_mysqld.cc @@ -74,10 +74,7 @@ const char *wsrep_start_position; const char *wsrep_data_home_dir; const char *wsrep_dbug_option; const char *wsrep_notify_cmd; -const char *wsrep_sst_method; -const char *wsrep_sst_receive_address; -const char *wsrep_sst_donor; -const char *wsrep_sst_auth; + my_bool wsrep_debug; // Enable debug level logging my_bool wsrep_convert_LOCK_to_trx; // Convert locking sessions to trx my_bool wsrep_auto_increment_control; // Control auto increment variables @@ -89,7 +86,6 @@ my_bool wsrep_log_conflicts; my_bool wsrep_load_data_splitting; // Commit load data every 10K intervals my_bool wsrep_slave_UK_checks; // Slave thread does UK checks my_bool wsrep_slave_FK_checks; // Slave thread does FK checks -my_bool wsrep_sst_donor_rejects_queries; my_bool wsrep_restart_slave; // Should mysql slave thread be // restarted, when node joins back? my_bool wsrep_desync; // De(re)synchronize the node from the diff --git a/sql/wsrep_sst.cc b/sql/wsrep_sst.cc index 28e9ba234b2..3790c81d398 100644 --- a/sql/wsrep_sst.cc +++ b/sql/wsrep_sst.cc @@ -38,8 +38,14 @@ static char wsrep_defaults_file[FN_REFLEN * 2 + 10 + 30 + sizeof(WSREP_SST_OPT_CONF_SUFFIX) + sizeof(WSREP_SST_OPT_CONF_EXTRA)] = {0}; +const char* wsrep_sst_method = WSREP_SST_DEFAULT; +const char* wsrep_sst_receive_address = WSREP_SST_ADDRESS_AUTO; +const char* wsrep_sst_donor = ""; +const char* wsrep_sst_auth = NULL; + // container for real auth string static const char* sst_auth_real = NULL; +my_bool wsrep_sst_donor_rejects_queries = FALSE; bool wsrep_sst_method_check (sys_var *self, THD* thd, set_var* var) { @@ -157,7 +163,7 @@ void wsrep_sst_auth_free() bool wsrep_sst_auth_update (sys_var *self, THD* thd, enum_var_type type) { - return sst_auth_real_set (wsrep_sst_auth); + return sst_auth_real_set (wsrep_sst_auth); } void wsrep_sst_auth_init () @@ -172,9 +178,11 @@ bool wsrep_sst_donor_check (sys_var *self, THD* thd, set_var* var) bool wsrep_sst_donor_update (sys_var *self, THD* thd, enum_var_type type) { - return 0; + return 0; } +static wsrep_uuid_t cluster_uuid = WSREP_UUID_UNDEFINED; + bool wsrep_before_SE() { return (wsrep_provider != NULL @@ -304,7 +312,7 @@ bool wsrep_sst_received (wsrep_t* const wsrep, } if (memcmp(&local_uuid, &uuid, sizeof(wsrep_uuid_t)) || - local_seqno < seqno) + local_seqno < seqno || seqno < 0) { do_update= true; }

1 0