revision-id: ce709b82efe465b87b5f839b23b933893ea7685a (mariadb-10.4.1-166-gce709b82efe) parent(s): 3a269a8b5272c15751f565daa1566d1f61a1f04f author: Jan Lindström committer: Jan Lindström timestamp: 2019-02-13 08:39:44 +0200 message: MDEV-18564: Change wsrep_load_data_splitting off by default Variable wsrep_load_data_splitting is deprecated and should be off by default. --- mysql-test/suite/galera/r/galera_defaults.result | 2 +- mysql-test/suite/galera/r/galera_var_load_data_splitting.result | 6 +++++- mysql-test/suite/galera/r/partition.result | 2 +- mysql-test/suite/galera/t/galera_var_load_data_splitting.test | 3 +++ mysql-test/suite/sys_vars/r/sysvars_wsrep.result | 4 ++-- mysql-test/suite/sys_vars/r/wsrep_load_data_splitting_basic.result | 4 ++-- sql/sys_vars.cc | 2 +- 7 files changed, 15 insertions(+), 8 deletions(-) diff --git a/mysql-test/suite/galera/r/galera_defaults.result b/mysql-test/suite/galera/r/galera_defaults.result index 20ea590e2e5..4aef4f5e48c 100644 --- a/mysql-test/suite/galera/r/galera_defaults.result +++ b/mysql-test/suite/galera/r/galera_defaults.result @@ -34,7 +34,7 @@ WSREP_FORCED_BINLOG_FORMAT NONE WSREP_GTID_DOMAIN_ID 0 WSREP_GTID_MODE OFF WSREP_IGNORE_APPLY_ERRORS 7 -WSREP_LOAD_DATA_SPLITTING ON +WSREP_LOAD_DATA_SPLITTING OFF WSREP_LOG_CONFLICTS OFF WSREP_MAX_WS_ROWS 0 WSREP_MAX_WS_SIZE 2147483647 diff --git a/mysql-test/suite/galera/r/galera_var_load_data_splitting.result b/mysql-test/suite/galera/r/galera_var_load_data_splitting.result index 9078e9ea985..66bc6bc4a9a 100644 --- a/mysql-test/suite/galera/r/galera_var_load_data_splitting.result +++ b/mysql-test/suite/galera/r/galera_var_load_data_splitting.result @@ -12,7 +12,11 @@ COUNT(*) = 95000 wsrep_last_committed_diff 1 connection node_1; -SET GLOBAL wsrep_load_data_splitting = 1;; +SET GLOBAL wsrep_load_data_splitting = 0;; +Warnings: +Warning 1287 '@@wsrep_load_data_splitting' is deprecated and will be removed in a future release +connection node_2; +SET GLOBAL wsrep_load_data_splitting = 0;; Warnings: Warning 1287 '@@wsrep_load_data_splitting' is deprecated and will be removed in a future release DROP TABLE t1; diff --git a/mysql-test/suite/galera/r/partition.result b/mysql-test/suite/galera/r/partition.result index 213f9dfdbab..2e16d06519c 100644 --- a/mysql-test/suite/galera/r/partition.result +++ b/mysql-test/suite/galera/r/partition.result @@ -159,7 +159,7 @@ wsrep_last_committed_diff AS_EXPECTED_1_or_2 DROP TABLE t1; connection node_1; -SET GLOBAL wsrep_load_data_splitting = 1;; +SET GLOBAL wsrep_load_data_splitting = 0;; Warnings: Warning 1287 '@@wsrep_load_data_splitting' is deprecated and will be removed in a future release disconnect node_2; diff --git a/mysql-test/suite/galera/t/galera_var_load_data_splitting.test b/mysql-test/suite/galera/t/galera_var_load_data_splitting.test index 38dab0a981b..621cb69fc16 100644 --- a/mysql-test/suite/galera/t/galera_var_load_data_splitting.test +++ b/mysql-test/suite/galera/t/galera_var_load_data_splitting.test @@ -36,4 +36,7 @@ SELECT COUNT(*) = 95000 FROM t1; --connection node_1 --eval SET GLOBAL wsrep_load_data_splitting = $wsrep_load_data_splitting_orig; +--connection node_2 +--eval SET GLOBAL wsrep_load_data_splitting = $wsrep_load_data_splitting_orig; + DROP TABLE t1; diff --git a/mysql-test/suite/sys_vars/r/sysvars_wsrep.result b/mysql-test/suite/sys_vars/r/sysvars_wsrep.result index dd3e70c587d..49eaaa965dc 100644 --- a/mysql-test/suite/sys_vars/r/sysvars_wsrep.result +++ b/mysql-test/suite/sys_vars/r/sysvars_wsrep.result @@ -227,9 +227,9 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME WSREP_LOAD_DATA_SPLITTING SESSION_VALUE NULL -GLOBAL_VALUE ON +GLOBAL_VALUE OFF GLOBAL_VALUE_ORIGIN COMPILE-TIME -DEFAULT_VALUE ON +DEFAULT_VALUE OFF VARIABLE_SCOPE GLOBAL VARIABLE_TYPE BOOLEAN VARIABLE_COMMENT To commit LOAD DATA transaction after every 10K rows inserted (deprecated) diff --git a/mysql-test/suite/sys_vars/r/wsrep_load_data_splitting_basic.result b/mysql-test/suite/sys_vars/r/wsrep_load_data_splitting_basic.result index d373a3832d5..3171a690486 100644 --- a/mysql-test/suite/sys_vars/r/wsrep_load_data_splitting_basic.result +++ b/mysql-test/suite/sys_vars/r/wsrep_load_data_splitting_basic.result @@ -6,7 +6,7 @@ SET @wsrep_load_data_splitting_global_saved = @@global.wsrep_load_data_splitting # default SELECT @@global.wsrep_load_data_splitting; @@global.wsrep_load_data_splitting -1 +0 # scope SELECT @@session.wsrep_load_data_splitting; @@ -42,7 +42,7 @@ Warnings: Warning 1287 '@@wsrep_load_data_splitting' is deprecated and will be removed in a future release SELECT @@global.wsrep_load_data_splitting; @@global.wsrep_load_data_splitting -1 +0 # invalid values SET @@global.wsrep_load_data_splitting=NULL; diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc index 7241685fb61..fd5ad8c9a5d 100644 --- a/sql/sys_vars.cc +++ b/sql/sys_vars.cc @@ -5522,7 +5522,7 @@ static Sys_var_mybool Sys_wsrep_load_data_splitting( "wsrep_load_data_splitting", "To commit LOAD DATA " "transaction after every 10K rows inserted (deprecated)", GLOBAL_VAR(wsrep_load_data_splitting), - CMD_LINE(OPT_ARG), DEFAULT(TRUE), NO_MUTEX_GUARD, NOT_IN_BINLOG, + CMD_LINE(OPT_ARG), DEFAULT(0), NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0), ON_UPDATE(0), DEPRECATED("")); static Sys_var_mybool Sys_wsrep_slave_FK_checks(