- commits - lists.mariadb.org

[Commits] 0b7339e: MDEV-17382 Hash join algorithm should not be used to join materialized
by IgorBabaev 07 Oct '18

07 Oct '18

revision-id: 0b7339eb451d5ffb141ac0a89b3596eec6dc948f (mariadb-5.5.61-28-g0b7339e) parent(s): 9905949b414740cdb15d5048b3289e4c5bb54f93 author: Igor Babaev committer: Igor Babaev timestamp: 2018-10-07 10:19:19 -0700 message: MDEV-17382 Hash join algorithm should not be used to join materialized derived table / view by equality Now rows of a materialized derived table are always put into a temporary table before join operation. If BNLH is used to join this table with the result of a partial join then both operands of the join are actually put into main memory. In most cases this is not efficient. We could avoid this by sending the rows of the derived table directly to the join operation. However this kind of data flow is not supported yet. Fixed by not allowing usage of hash join algorithm to join a materialized derived table if it's joined by an equality predicate of the form f=e where f is a field of the derived table. --- mysql-test/r/derived_opt.result | 35 ++++++++++++++++++++++++++++++++++- mysql-test/r/innodb_mrr_cpk.result | 2 +- mysql-test/t/derived_opt.test | 38 ++++++++++++++++++++++++++++++++++++++ sql/sql_select.cc | 8 ++++++++ 4 files changed, 81 insertions(+), 2 deletions(-) diff --git a/mysql-test/r/derived_opt.result b/mysql-test/r/derived_opt.result index dc9b591..bbca7f2 100644 --- a/mysql-test/r/derived_opt.result +++ b/mysql-test/r/derived_opt.result @@ -499,9 +499,42 @@ where D1.a= t1.a; id select_type table type possible_keys key key_len ref rows Extra 1 PRIMARY t1 ALL NULL NULL NULL NULL 10 Using where -1 PRIMARY <derived2> hash_ALL key0 #hash#key0 5 test.t1.a 100 Using join buffer (flat, BNLH join) +1 PRIMARY <derived2> ref key0 key0 5 test.t1.a 10 2 DERIVED t2 ALL NULL NULL NULL NULL 100 Using filesort set join_cache_level=@tmp_jcl; set optimizer_switch=@tmp_os; drop table t1, t2; +# +# Bug mdev-17382: equi-join of derived table with join_cache_level=4 +# +CREATE TABLE t1 ( +id int NOT NULL, +amount decimal DEFAULT NULL, +PRIMARY KEY (id) +); +CREATE TABLE t2 ( +id int NOT NULL, +name varchar(50) DEFAULT NULL, +PRIMARY KEY (id) +); +INSERT INTO t1 VALUES +(1, 10.0000), (2, 20.0000), (3, 30.0000), (4, 40.0000), +(5, NULL), (6, NULL), (7, 70.0000), (8, 80.0000); +INSERT INTO t2 VALUES +(1,'A'), (2,'B'), (3,'C'), (4,'D'), (5, NULL), (6, NULL), +(7,'E'), (8,'F'), (9,'G'), (10,'H'), (11, NULL), (12, NULL); +set join_cache_level=4; +EXPLAIN +SELECT t2.id,t2.name,t.total_amt +FROM t2 +LEFT JOIN +(SELECT id, sum(amount) total_amt FROM t1 GROUP BY id) AS t +ON t2.id=t.id +WHERE t2.id < 3; +id select_type table type possible_keys key key_len ref rows Extra +1 PRIMARY t2 range PRIMARY PRIMARY 4 NULL 3 Using index condition +1 PRIMARY <derived2> ref key0 key0 5 test.t2.id 2 +2 DERIVED t1 ALL NULL NULL NULL NULL 8 Using temporary; Using filesort +set join_cache_level=default; +DROP TABLE t1,t2; set optimizer_switch=@exit_optimizer_switch; diff --git a/mysql-test/r/innodb_mrr_cpk.result b/mysql-test/r/innodb_mrr_cpk.result index 99ed73a..355eae7 100644 --- a/mysql-test/r/innodb_mrr_cpk.result +++ b/mysql-test/r/innodb_mrr_cpk.result @@ -226,7 +226,7 @@ set join_cache_level=3; explain SELECT 1 FROM (SELECT url, id FROM t2 LIMIT 1 OFFSET 20) derived RIGHT JOIN t1 ON t1.id = derived.id; id select_type table type possible_keys key key_len ref rows Extra 1 PRIMARY t1 ALL NULL NULL NULL NULL # -1 PRIMARY <derived2> hash_ALL key0 #hash#key0 25 test.t1.id # Using join buffer (flat, BNLH join) +1 PRIMARY <derived2> ref key0 key0 25 test.t1.id # 2 DERIVED t2 ALL NULL NULL NULL NULL # set join_cache_level= @tmp_mdev5037; drop table t0,t1,t2; diff --git a/mysql-test/t/derived_opt.test b/mysql-test/t/derived_opt.test index 7f19553..aab95f6 100644 --- a/mysql-test/t/derived_opt.test +++ b/mysql-test/t/derived_opt.test @@ -363,5 +363,43 @@ set join_cache_level=@tmp_jcl; set optimizer_switch=@tmp_os; drop table t1, t2; +--echo # +--echo # Bug mdev-17382: equi-join of derived table with join_cache_level=4 +--echo # + +CREATE TABLE t1 ( + id int NOT NULL, + amount decimal DEFAULT NULL, +PRIMARY KEY (id) +); + +CREATE TABLE t2 ( + id int NOT NULL, + name varchar(50) DEFAULT NULL, +PRIMARY KEY (id) +); + +INSERT INTO t1 VALUES +(1, 10.0000), (2, 20.0000), (3, 30.0000), (4, 40.0000), +(5, NULL), (6, NULL), (7, 70.0000), (8, 80.0000); + +INSERT INTO t2 VALUES +(1,'A'), (2,'B'), (3,'C'), (4,'D'), (5, NULL), (6, NULL), +(7,'E'), (8,'F'), (9,'G'), (10,'H'), (11, NULL), (12, NULL); + +set join_cache_level=4; + +EXPLAIN +SELECT t2.id,t2.name,t.total_amt + FROM t2 + LEFT JOIN + (SELECT id, sum(amount) total_amt FROM t1 GROUP BY id) AS t + ON t2.id=t.id + WHERE t2.id < 3; + +set join_cache_level=default; + +DROP TABLE t1,t2; + # The following command must be the last one the file set optimizer_switch=@exit_optimizer_switch; diff --git a/sql/sql_select.cc b/sql/sql_select.cc index b2b2bcd..35937f0 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -10054,7 +10054,15 @@ uint check_join_cache_usage(JOIN_TAB *tab, effort now. */ if (tab->table->pos_in_table_list->is_materialized_derived()) + { no_bka_cache= true; + /* + Don't use hash join algorithm if the temporary table for the rows + of the derived table will be created with an equi-join key. + */ + if (tab->table->s->keys) + no_hashed_cache= true; + } /* Don't use join buffering if we're dictated not to by no_jbuf_after

1 0

[Commits] cb02453ae54: Test 3.
by jan 06 Oct '18

06 Oct '18

revision-id: cb02453ae5409c133fc4227899f25c44f4e8af99 (mariadb-10.1.35-81-gcb02453ae54) parent(s): 2e75f1575bb5890b85e128739c94c925666219e7 author: Jan Lindström committer: Jan Lindström timestamp: 2018-10-06 08:19:22 +0300 message: Test 3. --- mysql-test/suite/galera/disabled.def | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mysql-test/suite/galera/disabled.def b/mysql-test/suite/galera/disabled.def index 603031f52b7..719fb0f417d 100644 --- a/mysql-test/suite/galera/disabled.def +++ b/mysql-test/suite/galera/disabled.def @@ -34,4 +34,4 @@ partition : MDEV-13881 galera.partition failed in buildbot with wrong result galera_as_slave_replication_budle : MDEV-15785 Test case galera_as_slave_replication_bundle caused debug assertion galera_wan : MDEV-17259: Test failure on galera.galera_wan galera_pc_ignore_sb : MDEV-17357 Test failure on galera.galera_pc_ignore_sb -galera_drop_database : test +

1 0

[Commits] 2e75f1575bb: Test 3.
by jan 05 Oct '18

05 Oct '18

revision-id: 2e75f1575bb5890b85e128739c94c925666219e7 (mariadb-10.1.35-80-g2e75f1575bb) parent(s): b4c5059b88e414727f9c2952f56f54c1bb88ba79 author: Jan Lindström committer: Jan Lindström timestamp: 2018-10-05 18:13:44 +0300 message: Test 3. --- storage/innobase/fts/fts0fts.cc | 2 +- storage/xtradb/fts/fts0fts.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/storage/innobase/fts/fts0fts.cc b/storage/innobase/fts/fts0fts.cc index 24fac4ece50..d947e9674a9 100644 --- a/storage/innobase/fts/fts0fts.cc +++ b/storage/innobase/fts/fts0fts.cc @@ -2768,7 +2768,7 @@ fts_cmp_set_sync_doc_id( mutex_enter(&cache->doc_id_lock); /* For each sync operation, we will add next_doc_id by 1, so to mark a sync operation */ - if (cache->next_doc_id < cache->synced_doc_id + 1) { + if (cache->next_doc_id <= cache->synced_doc_id) { cache->next_doc_id = cache->synced_doc_id + 1; } mutex_exit(&cache->doc_id_lock); diff --git a/storage/xtradb/fts/fts0fts.cc b/storage/xtradb/fts/fts0fts.cc index eaba30820e0..f064e5a0abe 100644 --- a/storage/xtradb/fts/fts0fts.cc +++ b/storage/xtradb/fts/fts0fts.cc @@ -2767,7 +2767,7 @@ fts_cmp_set_sync_doc_id( mutex_enter(&cache->doc_id_lock); /* For each sync operation, we will add next_doc_id by 1, so to mark a sync operation */ - if (cache->next_doc_id < cache->synced_doc_id + 1) { + if (cache->next_doc_id <= cache->synced_doc_id) { cache->next_doc_id = cache->synced_doc_id + 1; } mutex_exit(&cache->doc_id_lock);

1 0

[Commits] a1082c61292: MDEV-17098 DATE -> DATETIME replication conversion not working, even in ALL_NON_LOSSY mode
by andrei.elkin＠pp.inet.fi 05 Oct '18

05 Oct '18

revision-id: a1082c6129209db6ee4470a84955ce9cc545e0b2 (mariadb-10.2.18-8-ga1082c61292) parent(s): 753117fed043ac3200093c2dc28161ebce2cd04b author: Andrei Elkin committer: Andrei Elkin timestamp: 2018-10-05 17:36:52 +0300 message: MDEV-17098 DATE -> DATETIME replication conversion not working, even in ALL_NON_LOSSY mode Opened up MYSQL_TYPE _DATETIME{,2} <-> _NEWDATE conversions for replication. --- mysql-test/suite/rpl/include/rpl_colsize_check.inc | 23 +++ mysql-test/suite/rpl/r/rpl_colSize.result | 204 +++++++++++++++++++++ mysql-test/suite/rpl/r/rpl_row_colSize.result | 24 +++ mysql-test/suite/rpl/t/rpl_colSize.test | 126 +++++++++++++ mysql-test/suite/rpl/t/rpl_row_colSize.test | 10 + sql/rpl_utility.cc | 31 +++- 6 files changed, 415 insertions(+), 3 deletions(-) diff --git a/mysql-test/suite/rpl/include/rpl_colsize_check.inc b/mysql-test/suite/rpl/include/rpl_colsize_check.inc new file mode 100644 index 00000000000..0c5bdd56610 --- /dev/null +++ b/mysql-test/suite/rpl/include/rpl_colsize_check.inc @@ -0,0 +1,23 @@ +# Create a table on master and slave possibly with imcompatible attributes; +# INSERT into the table and replicate; +# print out inserted values. +--connection master +--eval DROP TABLE IF EXISTS $table; +sync_slave_with_master slave; + +--connection master +--eval CREATE TABLE $table ($attr_m) +--replace_result default DEFAULT +--eval SHOW CREATE TABLE $table + +sync_slave_with_master slave; +--eval ALTER TABLE $table MODIFY $attr_s +--replace_result default DEFAULT +--eval SHOW CREATE TABLE $table + +--connection master +--eval INSERT INTO t1 VALUES $values2 +--eval SELECT $check_m from $table + +sync_slave_with_master slave; +--eval SELECT $check_s from $table diff --git a/mysql-test/suite/rpl/r/rpl_colSize.result b/mysql-test/suite/rpl/r/rpl_colSize.result index 503bf85222e..fae03a4211b 100644 --- a/mysql-test/suite/rpl/r/rpl_colSize.result +++ b/mysql-test/suite/rpl/r/rpl_colSize.result @@ -189,6 +189,210 @@ t1 CREATE TABLE `t1` ( `d` bit(25) DEFAULT NULL, `e` bit(13) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 +connection master; +SET @saved_mysql56_temporal_format = @@global.mysql56_temporal_format; +connection slave; +SET @saved_mysql56_temporal_format = @@global.mysql56_temporal_format; +MYSQL_TYPE_NEWDATE <-> MYSQL_TYPE_DATETIME2 +connection master; +SET @@global.mysql56_temporal_format=1; +connection slave; +SET @@global.mysql56_temporal_format=1; +Checking NON-LOSSY MYSQL_TYPE_NEWDATE -> MYSQL_TYPE_DATETIME2 +connection master; +DROP TABLE IF EXISTS t1;; +connection slave; +connection master; +CREATE TABLE t1 (a DATE); +SHOW CREATE TABLE t1; +Table Create Table +t1 CREATE TABLE `t1` ( + `a` date DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +connection slave; +ALTER TABLE t1 MODIFY a DATETIME(6); +SHOW CREATE TABLE t1; +Table Create Table +t1 CREATE TABLE `t1` ( + `a` datetime(6) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +connection master; +INSERT INTO t1 VALUES (current_date()),(date_add(current_date(), INTERVAL 1 day)); +SELECT max(a) - min(a) as 'master: one' from t1; +master: one +1 +connection slave; +SELECT date(max(a)) - date(min(a)) as 'slave: 1' from t1; +slave: 1 +1 +Checking LOSSY MYSQL_TYPE_DATETIME2 -> MYSQL_TYPE_NEWDATE +SET @local_saved_slave_type_conversions = @@slave_type_conversions; +SET GLOBAL SLAVE_TYPE_CONVERSIONS = 'ALL_LOSSY'; +connection master; +DROP TABLE IF EXISTS t1;; +connection slave; +connection master; +CREATE TABLE t1 (a DATETIME(6)); +SHOW CREATE TABLE t1; +Table Create Table +t1 CREATE TABLE `t1` ( + `a` datetime(6) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +connection slave; +ALTER TABLE t1 MODIFY a DATE; +SHOW CREATE TABLE t1; +Table Create Table +t1 CREATE TABLE `t1` ( + `a` date DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +connection master; +INSERT INTO t1 VALUES (current_timestamp(6)), (date_add(current_timestamp(6), INTERVAL 1 day)); +SELECT date(max(a)) - date(min(a)) as 'master: one day' from t1; +master: one day +1 +connection slave; +SELECT max(a) - min(a) as 'slave: 1 day' from t1; +slave: 1 day +1 +SET GLOBAL SLAVE_TYPE_CONVERSIONS = @local_saved_slave_type_conversions; +"Mysql" MYSQL_TYPE_NEWDATE <-> MYSQL_TYPE_DATETIME +connection master; +SET @@global.mysql56_temporal_format=1; +connection slave; +SET @@global.mysql56_temporal_format=0; +Checking NON-LOSSY MYSQL_TYPE_NEWDATE -> MYSQL_TYPE_DATETIME +connection master; +DROP TABLE IF EXISTS t1;; +connection slave; +connection master; +CREATE TABLE t1 (a DATE); +SHOW CREATE TABLE t1; +Table Create Table +t1 CREATE TABLE `t1` ( + `a` date DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +connection slave; +ALTER TABLE t1 MODIFY a DATETIME(6); +SHOW CREATE TABLE t1; +Table Create Table +t1 CREATE TABLE `t1` ( + `a` datetime(6) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +connection master; +INSERT INTO t1 VALUES (current_date()),(date_add(current_date(), INTERVAL 1 day)); +SELECT max(a) - min(a) as 'master: one' from t1; +master: one +1 +connection slave; +SELECT date(max(a)) - date(min(a)) as 'slave: 1' from t1; +slave: 1 +1 +Checking LOSSY MYSQL_TYPE_DATETIME2 -> MYSQL_TYPE_DATE +SET @local_saved_slave_type_conversions = @@slave_type_conversions; +SET GLOBAL SLAVE_TYPE_CONVERSIONS = 'ALL_LOSSY'; +connection master; +DROP TABLE IF EXISTS t1;; +connection slave; +connection master; +CREATE TABLE t1 (a DATETIME(6)); +SHOW CREATE TABLE t1; +Table Create Table +t1 CREATE TABLE `t1` ( + `a` datetime(6) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +connection slave; +ALTER TABLE t1 MODIFY a DATE; +SHOW CREATE TABLE t1; +Table Create Table +t1 CREATE TABLE `t1` ( + `a` date DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +connection master; +INSERT INTO t1 VALUES (current_timestamp(6)), (date_add(current_timestamp(6), INTERVAL 1 day)); +SELECT date(max(a)) - date(min(a)) as 'master: one day' from t1; +master: one day +1 +connection slave; +SELECT max(a) - min(a) as 'slave: 1 day' from t1; +slave: 1 day +1 +SET GLOBAL SLAVE_TYPE_CONVERSIONS = @local_saved_slave_type_conversions; +"Maria" MYSQL_TYPE_NEWDATE <-> MYSQL_TYPE_DATETIME2 +connection master; +SET @@global.mysql56_temporal_format=0; +connection slave; +SET @@global.mysql56_temporal_format=1; +Checking NON-LOSSY MYSQL_TYPE_NEWDATE -> MYSQL_TYPE_DATETIME +connection master; +DROP TABLE IF EXISTS t1;; +connection slave; +connection master; +CREATE TABLE t1 (a DATE); +SHOW CREATE TABLE t1; +Table Create Table +t1 CREATE TABLE `t1` ( + `a` date DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +connection slave; +ALTER TABLE t1 MODIFY a DATETIME(6); +SHOW CREATE TABLE t1; +Table Create Table +t1 CREATE TABLE `t1` ( + `a` datetime(6) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +connection master; +INSERT INTO t1 VALUES (current_date()),(date_add(current_date(), INTERVAL 1 day)); +SELECT max(a) - min(a) as 'master: one' from t1; +master: one +1 +connection slave; +SELECT date(max(a)) - date(min(a)) as 'slave: 1' from t1; +slave: 1 +1 +Checking LOSSY MYSQL_TYPE_DATETIME -> MYSQL_TYPE_NEWDATE +SET @local_saved_slave_type_conversions = @@slave_type_conversions; +SET GLOBAL SLAVE_TYPE_CONVERSIONS = 'ALL_LOSSY'; +SET GLOBAL SLAVE_TYPE_CONVERSIONS = @local_saved_slave_type_conversions; +"Maria" MYSQL_TYPE_NEWDATE <-> MYSQL_TYPE_DATETIME +connection master; +SET @@global.mysql56_temporal_format=0; +connection slave; +SET @@global.mysql56_temporal_format=0; +Checking NON-LOSSY MYSQL_TYPE_NEWDATE -> MYSQL_TYPE_DATETIME +connection master; +DROP TABLE IF EXISTS t1;; +connection slave; +connection master; +CREATE TABLE t1 (a DATE); +SHOW CREATE TABLE t1; +Table Create Table +t1 CREATE TABLE `t1` ( + `a` date DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +connection slave; +ALTER TABLE t1 MODIFY a DATETIME(6); +SHOW CREATE TABLE t1; +Table Create Table +t1 CREATE TABLE `t1` ( + `a` datetime(6) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +connection master; +INSERT INTO t1 VALUES (current_date()),(date_add(current_date(), INTERVAL 1 day)); +SELECT max(a) - min(a) as 'master: one' from t1; +master: one +1 +connection slave; +SELECT date(max(a)) - date(min(a)) as 'slave: 1' from t1; +slave: 1 +1 +Checking LOSSY MYSQL_TYPE_DATETIME -> MYSQL_TYPE_NEWDATE +SET @local_saved_slave_type_conversions = @@slave_type_conversions; +SET GLOBAL SLAVE_TYPE_CONVERSIONS = 'ALL_LOSSY'; +SET GLOBAL SLAVE_TYPE_CONVERSIONS = @local_saved_slave_type_conversions; +connection master; +SET @@global.mysql56_temporal_format=@saved_mysql56_temporal_format; +connection slave; +SET @@global.mysql56_temporal_format=@saved_mysql56_temporal_format; *** Cleanup *** connection master; DROP TABLE t1; diff --git a/mysql-test/suite/rpl/r/rpl_row_colSize.result b/mysql-test/suite/rpl/r/rpl_row_colSize.result index dd324ef7807..ede73cbeedd 100644 --- a/mysql-test/suite/rpl/r/rpl_row_colSize.result +++ b/mysql-test/suite/rpl/r/rpl_row_colSize.result @@ -344,6 +344,30 @@ connection master; RESET MASTER; connection slave; START SLAVE; +Checking MYSQL_TYPE_DATETIME to MYSQL_TYPE_DATE +connection master; +DROP TABLE IF EXISTS t1; +connection slave; +STOP SLAVE; +RESET SLAVE; +CREATE TABLE t1 (a date); +connection master; +CREATE TABLE t1 (a datetime(6)); +RESET MASTER; +INSERT INTO t1 VALUES (current_date()); +connection slave; +START SLAVE; +include/wait_for_slave_sql_error.inc [errno=1677] +Last_SQL_Error = 'Column 0 of table 'test.t1' cannot be converted from type 'datetime' to type 'date'' +SELECT COUNT(*) FROM t1; +COUNT(*) +0 +STOP SLAVE; +RESET SLAVE; +connection master; +RESET MASTER; +connection slave; +START SLAVE; connection slave; call mtr.add_suppression("Slave SQL.*Table definition on master and slave does not match: Column 0 ...e mismatch.* error.* 1535"); call mtr.add_suppression("Slave SQL.*Column 0 of table .test.t1. cannot be converted from type.* error.* 1677"); diff --git a/mysql-test/suite/rpl/t/rpl_colSize.test b/mysql-test/suite/rpl/t/rpl_colSize.test index d6f817af189..1a965b17e58 100644 --- a/mysql-test/suite/rpl/t/rpl_colSize.test +++ b/mysql-test/suite/rpl/t/rpl_colSize.test @@ -217,6 +217,132 @@ SELECT BIN(a), BIN(b), BIN(c), BIN(d), BIN(e) FROM t1; --replace_result default DEFAULT SHOW CREATE TABLE t1; +# +# MDEV-17098: Checking MYSQL_TYPE _DATETIME{,2} to-from _{NEW,}DATE conversion +# + +connection master; +SET @saved_mysql56_temporal_format = @@global.mysql56_temporal_format; +connection slave; +SET @saved_mysql56_temporal_format = @@global.mysql56_temporal_format; + +--echo MYSQL_TYPE_NEWDATE <-> MYSQL_TYPE_DATETIME2 +connection master; +SET @@global.mysql56_temporal_format=1; +connection slave; +SET @@global.mysql56_temporal_format=1; +--echo Checking NON-LOSSY MYSQL_TYPE_NEWDATE -> MYSQL_TYPE_DATETIME2 +--let $table = t1 +--let $attr_m = a DATE +--let $attr_s = a DATETIME(6) +--let $values2 = (current_date()),(date_add(current_date(), INTERVAL 1 day)) +--let $check_m = max(a) - min(a) as 'master: one' +--let $check_s = date(max(a)) - date(min(a)) as 'slave: 1' +--source include/rpl_colsize_check.inc + +--echo Checking LOSSY MYSQL_TYPE_DATETIME2 -> MYSQL_TYPE_NEWDATE +SET @local_saved_slave_type_conversions = @@slave_type_conversions; +SET GLOBAL SLAVE_TYPE_CONVERSIONS = 'ALL_LOSSY'; +--let $attr_m = a DATETIME(6) +--let $attr_s = a DATE +--let $values2 = (current_timestamp(6)), (date_add(current_timestamp(6), INTERVAL 1 day)) +--let $check_m = date(max(a)) - date(min(a)) as 'master: one day' +--let $check_s = max(a) - min(a) as 'slave: 1 day' +--source include/rpl_colsize_check.inc +SET GLOBAL SLAVE_TYPE_CONVERSIONS = @local_saved_slave_type_conversions; + +--echo "Mysql" MYSQL_TYPE_NEWDATE <-> MYSQL_TYPE_DATETIME +connection master; +SET @@global.mysql56_temporal_format=1; +connection slave; +SET @@global.mysql56_temporal_format=0; + +--echo Checking NON-LOSSY MYSQL_TYPE_NEWDATE -> MYSQL_TYPE_DATETIME +--let $table = t1 +--let $attr_m = a DATE +--let $attr_s = a DATETIME(6) +--let $values2 = (current_date()),(date_add(current_date(), INTERVAL 1 day)) +--let $check_m = max(a) - min(a) as 'master: one' +--let $check_s = date(max(a)) - date(min(a)) as 'slave: 1' +--source include/rpl_colsize_check.inc + +--echo Checking LOSSY MYSQL_TYPE_DATETIME2 -> MYSQL_TYPE_DATE +SET @local_saved_slave_type_conversions = @@slave_type_conversions; +SET GLOBAL SLAVE_TYPE_CONVERSIONS = 'ALL_LOSSY'; +--let $attr_m = a DATETIME(6) +--let $attr_s = a DATE +--let $values2 = (current_timestamp(6)), (date_add(current_timestamp(6), INTERVAL 1 day)) +--let $check_m = date(max(a)) - date(min(a)) as 'master: one day' +--let $check_s = max(a) - min(a) as 'slave: 1 day' +--source include/rpl_colsize_check.inc +SET GLOBAL SLAVE_TYPE_CONVERSIONS = @local_saved_slave_type_conversions; + +--echo "Maria" MYSQL_TYPE_NEWDATE <-> MYSQL_TYPE_DATETIME2 +connection master; +SET @@global.mysql56_temporal_format=0; +connection slave; +SET @@global.mysql56_temporal_format=1; + +--echo Checking NON-LOSSY MYSQL_TYPE_NEWDATE -> MYSQL_TYPE_DATETIME +--let $table = t1 +--let $attr_m = a DATE +--let $attr_s = a DATETIME(6) +--let $values2 = (current_date()),(date_add(current_date(), INTERVAL 1 day)) +--let $check_m = max(a) - min(a) as 'master: one' +--let $check_s = date(max(a)) - date(min(a)) as 'slave: 1' +--source include/rpl_colsize_check.inc + +--echo Checking LOSSY MYSQL_TYPE_DATETIME -> MYSQL_TYPE_NEWDATE +SET @local_saved_slave_type_conversions = @@slave_type_conversions; +SET GLOBAL SLAVE_TYPE_CONVERSIONS = 'ALL_LOSSY'; +--let $attr_m = a DATETIME(6) +--let $attr_s = a DATE +--let $values2 = (current_timestamp(6)), (date_add(current_timestamp(6), INTERVAL 1 day)) +--let $check_m = date(max(a)) - date(min(a)) as 'master: one day' +--let $check_s = max(a) - min(a) as 'slave: 1 day' + +### TODO: find out why +# AddressSanitizer: global-buffer-overflow on address 0x55b1fa26aceb at pc 0x55b1f8d46d5c bp 0x7f513f2aa530 sp 0x7f513f2aa520 +#READ of size 1 at 0x55b1fa26aceb thread T35 +# #0 0x55b1f8d46d5b in check_date /home/andrei/MDB/WTs/10.2/10.2-MDEV-17098/sql-common/my_time.c:91 +# #1 0x55b1f7b7b41e in Field_temporal_with_date::store_time_dec(st_mysql_time*, unsigned int) /home/andrei/MDB/WTs/10.2/10.2-MDEV-17098/sql/field.cc:5675 +# #2 0x55b1f7bb9f6a in Field::do_field_temporal(Copy_field*) /home/andrei/MDB/WTs/10.2/10.2-MDEV-17098/sql/field_conv.cc:434 +###--source include/rpl_colsize_check.inc +SET GLOBAL SLAVE_TYPE_CONVERSIONS = @local_saved_slave_type_conversions; + +--echo "Maria" MYSQL_TYPE_NEWDATE <-> MYSQL_TYPE_DATETIME +connection master; +SET @@global.mysql56_temporal_format=0; +connection slave; +SET @@global.mysql56_temporal_format=0; + +--echo Checking NON-LOSSY MYSQL_TYPE_NEWDATE -> MYSQL_TYPE_DATETIME +--let $table = t1 +--let $attr_m = a DATE +--let $attr_s = a DATETIME(6) +--let $values2 = (current_date()),(date_add(current_date(), INTERVAL 1 day)) +--let $check_m = max(a) - min(a) as 'master: one' +--let $check_s = date(max(a)) - date(min(a)) as 'slave: 1' +--source include/rpl_colsize_check.inc + +--echo Checking LOSSY MYSQL_TYPE_DATETIME -> MYSQL_TYPE_NEWDATE +SET @local_saved_slave_type_conversions = @@slave_type_conversions; +SET GLOBAL SLAVE_TYPE_CONVERSIONS = 'ALL_LOSSY'; +--let $attr_m = a DATETIME(6) +--let $attr_s = a DATE +--let $values2 = (current_timestamp(6)), (date_add(current_timestamp(6), INTERVAL 1 day)) +--let $check_m = date(max(a)) - date(min(a)) as 'master: one day' +--let $check_s = max(a) - min(a) as 'slave: 1 day' + +### The same as above +###--source include/rpl_colsize_check.inc +SET GLOBAL SLAVE_TYPE_CONVERSIONS = @local_saved_slave_type_conversions; + +connection master; +SET @@global.mysql56_temporal_format=@saved_mysql56_temporal_format; +connection slave; +SET @@global.mysql56_temporal_format=@saved_mysql56_temporal_format; + --echo *** Cleanup *** connection master; DROP TABLE t1; diff --git a/mysql-test/suite/rpl/t/rpl_row_colSize.test b/mysql-test/suite/rpl/t/rpl_row_colSize.test index 21c68b55e92..63659c07a0a 100644 --- a/mysql-test/suite/rpl/t/rpl_row_colSize.test +++ b/mysql-test/suite/rpl/t/rpl_row_colSize.test @@ -160,6 +160,16 @@ let $test_table_slave = CREATE TABLE t1 (a TINYBLOB); let $test_insert = INSERT INTO t1 VALUES ('This is a test.'); source include/test_fieldsize.inc; +# +# Test: Checking MYSQL_TYPE_DATE* fields +# +--echo Checking MYSQL_TYPE_DATETIME to MYSQL_TYPE_DATE +let $test_table_master = CREATE TABLE t1 (a datetime(6)); +let $test_table_slave = CREATE TABLE t1 (a date); +let $test_insert = INSERT INTO t1 VALUES (current_date()); +source include/test_fieldsize.inc; + + connection slave; call mtr.add_suppression("Slave SQL.*Table definition on master and slave does not match: Column 0 ...e mismatch.* error.* 1535"); call mtr.add_suppression("Slave SQL.*Column 0 of table .test.t1. cannot be converted from type.* error.* 1677"); diff --git a/sql/rpl_utility.cc b/sql/rpl_utility.cc index bdf5b7dea80..f64fa1dfe53 100644 --- a/sql/rpl_utility.cc +++ b/sql/rpl_utility.cc @@ -763,16 +763,41 @@ can_convert_field_to(Field *field, case MYSQL_TYPE_TIMESTAMP: case MYSQL_TYPE_DATE: case MYSQL_TYPE_TIME: - case MYSQL_TYPE_DATETIME: case MYSQL_TYPE_YEAR: - case MYSQL_TYPE_NEWDATE: case MYSQL_TYPE_NULL: case MYSQL_TYPE_ENUM: case MYSQL_TYPE_SET: case MYSQL_TYPE_TIMESTAMP2: - case MYSQL_TYPE_DATETIME2: case MYSQL_TYPE_TIME2: DBUG_RETURN(false); + case MYSQL_TYPE_NEWDATE: + { + if (field->real_type() == MYSQL_TYPE_DATETIME2 || + field->real_type() == MYSQL_TYPE_DATETIME) + { + *order_var= -1; + DBUG_RETURN(is_conversion_ok(*order_var, rli)); + } + else + { + DBUG_RETURN(false); + } + } + break; + case MYSQL_TYPE_DATETIME2: + case MYSQL_TYPE_DATETIME: + { + if (field->real_type() == MYSQL_TYPE_NEWDATE) + { + *order_var= 1; + DBUG_RETURN(is_conversion_ok(*order_var, rli)); + } + else + { + DBUG_RETURN(false); + } + } + break; } DBUG_RETURN(false); // To keep GCC happy }

1 0

[Commits] b4c5059b88e: Test2 with instrumentation.
by jan 05 Oct '18

05 Oct '18

revision-id: b4c5059b88e414727f9c2952f56f54c1bb88ba79 (mariadb-10.1.35-79-gb4c5059b88e) parent(s): f91167ce9d536ced2ab53bf33a4a4e92380e0f6d author: Jan Lindström committer: Jan Lindström timestamp: 2018-10-05 11:05:21 +0300 message: Test2 with instrumentation. --- storage/innobase/fts/fts0fts.cc | 30 +++++++++++++++++++++++++++++- storage/xtradb/fts/fts0fts.cc | 30 +++++++++++++++++++++++++++++- 2 files changed, 58 insertions(+), 2 deletions(-) diff --git a/storage/innobase/fts/fts0fts.cc b/storage/innobase/fts/fts0fts.cc index fa5207c8ec7..24fac4ece50 100644 --- a/storage/innobase/fts/fts0fts.cc +++ b/storage/innobase/fts/fts0fts.cc @@ -42,6 +42,12 @@ Full Text Search interface #include "ha_prototypes.h" +#ifdef WITH_WSREP +#include <log.h> +#include <wsrep_mysqld.h> +#include <wsrep.h> +#endif + #define FTS_MAX_ID_LEN 32 /** Column name from the FTS config table */ @@ -7041,7 +7047,29 @@ fts_check_and_drop_orphaned_tables( /* If the aux table is in decimal format, we should rename it, so push it to aux_tables_to_rename */ if (!drop && rename) { - ib_vector_push(aux_tables_to_rename, aux_table); + /* It is necessary to check that the table with + this name is missing in the vector - otherwise it + can be renamed twice: */ + bool rename_table = true; + for (ulint count = 0; + count < ib_vector_size(aux_tables_to_rename); + count++) { + fts_aux_table_t* rename_aux = + static_cast<fts_aux_table_t*>( + ib_vector_get(aux_tables_to_rename, + count)); + if (strcmp(rename_aux->name, + aux_table->name) == 0) { + rename_table = false; +#ifdef WITH_WSREP + WSREP_DEBUG("JAN: Not renamed list %s rename_table %s", rename_aux->name, aux_table->name); +#endif + break; + } + } + if (rename_table) { + ib_vector_push(aux_tables_to_rename, aux_table); + } } if (i + 1 < ib_vector_size(tables)) { diff --git a/storage/xtradb/fts/fts0fts.cc b/storage/xtradb/fts/fts0fts.cc index bcbaeb22738..eaba30820e0 100644 --- a/storage/xtradb/fts/fts0fts.cc +++ b/storage/xtradb/fts/fts0fts.cc @@ -42,6 +42,12 @@ Full Text Search interface #include "ha_prototypes.h" +#ifdef WITH_WSREP +#include <log.h> +#include <wsrep_mysqld.h> +#include <wsrep.h> +#endif + #define FTS_MAX_ID_LEN 32 /** Column name from the FTS config table */ @@ -7040,7 +7046,29 @@ fts_check_and_drop_orphaned_tables( /* If the aux table is in decimal format, we should rename it, so push it to aux_tables_to_rename */ if (!drop && rename) { - ib_vector_push(aux_tables_to_rename, aux_table); + /* It is necessary to check that the table with + this name is missing in the vector - otherwise it + can be renamed twice: */ + bool rename_table = true; + for (ulint count = 0; + count < ib_vector_size(aux_tables_to_rename); + count++) { + fts_aux_table_t* rename_aux = + static_cast<fts_aux_table_t*>( + ib_vector_get(aux_tables_to_rename, + count)); + if (strcmp(rename_aux->name, + aux_table->name) == 0) { + rename_table = false; +#ifdef WITH_WSREP + WSREP_DEBUG("JAN: Not renamed list %s rename_table %s", rename_aux->name, aux_table->name); +#endif + break; + } + } + if (rename_table) { + ib_vector_push(aux_tables_to_rename, aux_table); + } } if (i + 1 < ib_vector_size(tables)) {

1 0

[Commits] f91167ce9d5: Test 1.
by jan 05 Oct '18

05 Oct '18

revision-id: f91167ce9d536ced2ab53bf33a4a4e92380e0f6d (mariadb-10.1.35-78-gf91167ce9d5) parent(s): e855912733287d496cb2f429c8019005aaac9d0a author: Jan Lindström committer: Jan Lindström timestamp: 2018-10-05 07:52:46 +0300 message: Test 1. --- storage/innobase/fts/fts0fts.cc | 1 - storage/xtradb/fts/fts0fts.cc | 1 - 2 files changed, 2 deletions(-) diff --git a/storage/innobase/fts/fts0fts.cc b/storage/innobase/fts/fts0fts.cc index a5b2bbb47ce..fa5207c8ec7 100644 --- a/storage/innobase/fts/fts0fts.cc +++ b/storage/innobase/fts/fts0fts.cc @@ -6665,7 +6665,6 @@ fts_rename_aux_tables_to_hex_format( "All the fts index associated with the table are " "marked as corrupted. Please rebuild the " "index again.", parent_table->name); - fts_sql_rollback(trx_rename); /* Corrupting the fts index related to parent table. */ trx_t* trx_corrupt; diff --git a/storage/xtradb/fts/fts0fts.cc b/storage/xtradb/fts/fts0fts.cc index 5981c24c470..bcbaeb22738 100644 --- a/storage/xtradb/fts/fts0fts.cc +++ b/storage/xtradb/fts/fts0fts.cc @@ -6664,7 +6664,6 @@ fts_rename_aux_tables_to_hex_format( "All the fts index associated with the table are " "marked as corrupted. Please rebuild the " "index again.", parent_table->name); - fts_sql_rollback(trx_rename); /* Corrupting the fts index related to parent table. */ trx_t* trx_corrupt;

1 0

[Commits] 7d1fd1c49c2: MDEV-17098 DATE -> DATETIME replication conversion not working, even in ALL_NON_LOSSY mode
by andrei.elkin＠pp.inet.fi 04 Oct '18

04 Oct '18

revision-id: 7d1fd1c49c2137163f6b8d274b1d460cbf60e786 (mariadb-10.2.18-8-g7d1fd1c49c2) parent(s): 753117fed043ac3200093c2dc28161ebce2cd04b author: Andrei Elkin committer: Andrei Elkin timestamp: 2018-10-04 21:26:52 +0300 message: MDEV-17098 DATE -> DATETIME replication conversion not working, even in ALL_NON_LOSSY mode Opened up MYSQL_TYPE DATETIME2 <-> DATE conversions for replication. --- mysql-test/suite/rpl/r/rpl_colSize.result | 58 +++++++++++++++++++++++++++ mysql-test/suite/rpl/r/rpl_row_colSize.result | 24 +++++++++++ mysql-test/suite/rpl/t/rpl_colSize.test | 55 +++++++++++++++++++++++++ mysql-test/suite/rpl/t/rpl_row_colSize.test | 10 +++++ sql/rpl_utility.cc | 28 ++++++++++++- 5 files changed, 173 insertions(+), 2 deletions(-) diff --git a/mysql-test/suite/rpl/r/rpl_colSize.result b/mysql-test/suite/rpl/r/rpl_colSize.result index 503bf85222e..e08d1142bbb 100644 --- a/mysql-test/suite/rpl/r/rpl_colSize.result +++ b/mysql-test/suite/rpl/r/rpl_colSize.result @@ -189,6 +189,64 @@ t1 CREATE TABLE `t1` ( `d` bit(25) DEFAULT NULL, `e` bit(13) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 +Checking NON-LOSSY MYSQL_TYPE_DATE to MYSQL_TYPE_DATETIME +connection master; +DROP TABLE t1; +connection slave; +connection master; +CREATE TABLE t1 (a DATE); +SHOW CREATE TABLE t1; +Table Create Table +t1 CREATE TABLE `t1` ( + `a` date DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +connection slave; +ALTER TABLE t1 MODIFY a DATETIME(6); +SHOW CREATE TABLE t1; +Table Create Table +t1 CREATE TABLE `t1` ( + `a` datetime(6) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +connection master; +INSERT INTO t1 VALUES (current_date()), +(date_add(current_date(), INTERVAL 1 day)); +SELECT max(a) - min(a) as 'master: one' from t1; +master: one +1 +connection slave; +SELECT date(max(a)) - date(min(a)) as 'slave: 1' from t1; +slave: 1 +1 +Checking LOSSY MYSQL_TYPE_DATETIME to MYSQL_TYPE_DATE +SET @local_saved_slave_type_conversions = @@slave_type_conversions; +SET GLOBAL SLAVE_TYPE_CONVERSIONS = 'ALL_LOSSY'; +connection master; +DROP TABLE t1; +connection slave; +connection master; +CREATE TABLE t1 (a DATETIME(6)); +SHOW CREATE TABLE t1; +Table Create Table +t1 CREATE TABLE `t1` ( + `a` datetime(6) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +connection slave; +ALTER TABLE t1 MODIFY a DATE; +SHOW CREATE TABLE t1; +Table Create Table +t1 CREATE TABLE `t1` ( + `a` date DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +connection master; +INSERT INTO t1 VALUES (current_timestamp(6)), (date_add(current_timestamp(6), INTERVAL 1 day)); +SELECT date(max(a)) - date(min(a)) as 'master: one day' from t1; +master: one day +1 +connection slave; +SELECT max(a) - min(a) as 'slave: 1 day' from t1; +slave: 1 day +1 +SET GLOBAL SLAVE_TYPE_CONVERSIONS = @local_saved_slave_type_conversions; *** Cleanup *** connection master; DROP TABLE t1; diff --git a/mysql-test/suite/rpl/r/rpl_row_colSize.result b/mysql-test/suite/rpl/r/rpl_row_colSize.result index dd324ef7807..ede73cbeedd 100644 --- a/mysql-test/suite/rpl/r/rpl_row_colSize.result +++ b/mysql-test/suite/rpl/r/rpl_row_colSize.result @@ -344,6 +344,30 @@ connection master; RESET MASTER; connection slave; START SLAVE; +Checking MYSQL_TYPE_DATETIME to MYSQL_TYPE_DATE +connection master; +DROP TABLE IF EXISTS t1; +connection slave; +STOP SLAVE; +RESET SLAVE; +CREATE TABLE t1 (a date); +connection master; +CREATE TABLE t1 (a datetime(6)); +RESET MASTER; +INSERT INTO t1 VALUES (current_date()); +connection slave; +START SLAVE; +include/wait_for_slave_sql_error.inc [errno=1677] +Last_SQL_Error = 'Column 0 of table 'test.t1' cannot be converted from type 'datetime' to type 'date'' +SELECT COUNT(*) FROM t1; +COUNT(*) +0 +STOP SLAVE; +RESET SLAVE; +connection master; +RESET MASTER; +connection slave; +START SLAVE; connection slave; call mtr.add_suppression("Slave SQL.*Table definition on master and slave does not match: Column 0 ...e mismatch.* error.* 1535"); call mtr.add_suppression("Slave SQL.*Column 0 of table .test.t1. cannot be converted from type.* error.* 1677"); diff --git a/mysql-test/suite/rpl/t/rpl_colSize.test b/mysql-test/suite/rpl/t/rpl_colSize.test index d6f817af189..dc62bb659f0 100644 --- a/mysql-test/suite/rpl/t/rpl_colSize.test +++ b/mysql-test/suite/rpl/t/rpl_colSize.test @@ -217,6 +217,61 @@ SELECT BIN(a), BIN(b), BIN(c), BIN(d), BIN(e) FROM t1; --replace_result default DEFAULT SHOW CREATE TABLE t1; +# +# Test: Checking MYSQL_TYPE _DATETIME to-from _DATE conversion +# +--echo Checking NON-LOSSY MYSQL_TYPE_DATE to MYSQL_TYPE_DATETIME +connection master; +DROP TABLE t1; +sync_slave_with_master slave; + +connection master; +CREATE TABLE t1 (a DATE); +--replace_result default DEFAULT +SHOW CREATE TABLE t1; + +sync_slave_with_master slave; +ALTER TABLE t1 MODIFY a DATETIME(6); +--replace_result default DEFAULT +SHOW CREATE TABLE t1; + +connection master; +INSERT INTO t1 VALUES (current_date()), + (date_add(current_date(), INTERVAL 1 day)); +SELECT max(a) - min(a) as 'master: one' from t1; + +sync_slave_with_master slave; +SELECT date(max(a)) - date(min(a)) as 'slave: 1' from t1; + + +--echo Checking LOSSY MYSQL_TYPE_DATETIME to MYSQL_TYPE_DATE +SET @local_saved_slave_type_conversions = @@slave_type_conversions; +SET GLOBAL SLAVE_TYPE_CONVERSIONS = 'ALL_LOSSY'; + +connection master; +DROP TABLE t1; +sync_slave_with_master slave; + +connection master; +CREATE TABLE t1 (a DATETIME(6)); +--replace_result default DEFAULT +SHOW CREATE TABLE t1; + +sync_slave_with_master slave; +ALTER TABLE t1 MODIFY a DATE; +--replace_result default DEFAULT +SHOW CREATE TABLE t1; + +connection master; +INSERT INTO t1 VALUES (current_timestamp(6)), (date_add(current_timestamp(6), INTERVAL 1 day)); +SELECT date(max(a)) - date(min(a)) as 'master: one day' from t1; + +sync_slave_with_master slave; +SELECT max(a) - min(a) as 'slave: 1 day' from t1; + +SET GLOBAL SLAVE_TYPE_CONVERSIONS = @local_saved_slave_type_conversions; + + --echo *** Cleanup *** connection master; DROP TABLE t1; diff --git a/mysql-test/suite/rpl/t/rpl_row_colSize.test b/mysql-test/suite/rpl/t/rpl_row_colSize.test index 21c68b55e92..63659c07a0a 100644 --- a/mysql-test/suite/rpl/t/rpl_row_colSize.test +++ b/mysql-test/suite/rpl/t/rpl_row_colSize.test @@ -160,6 +160,16 @@ let $test_table_slave = CREATE TABLE t1 (a TINYBLOB); let $test_insert = INSERT INTO t1 VALUES ('This is a test.'); source include/test_fieldsize.inc; +# +# Test: Checking MYSQL_TYPE_DATE* fields +# +--echo Checking MYSQL_TYPE_DATETIME to MYSQL_TYPE_DATE +let $test_table_master = CREATE TABLE t1 (a datetime(6)); +let $test_table_slave = CREATE TABLE t1 (a date); +let $test_insert = INSERT INTO t1 VALUES (current_date()); +source include/test_fieldsize.inc; + + connection slave; call mtr.add_suppression("Slave SQL.*Table definition on master and slave does not match: Column 0 ...e mismatch.* error.* 1535"); call mtr.add_suppression("Slave SQL.*Column 0 of table .test.t1. cannot be converted from type.* error.* 1677"); diff --git a/sql/rpl_utility.cc b/sql/rpl_utility.cc index bdf5b7dea80..d94d496fb15 100644 --- a/sql/rpl_utility.cc +++ b/sql/rpl_utility.cc @@ -765,14 +765,38 @@ can_convert_field_to(Field *field, case MYSQL_TYPE_TIME: case MYSQL_TYPE_DATETIME: case MYSQL_TYPE_YEAR: - case MYSQL_TYPE_NEWDATE: case MYSQL_TYPE_NULL: case MYSQL_TYPE_ENUM: case MYSQL_TYPE_SET: case MYSQL_TYPE_TIMESTAMP2: - case MYSQL_TYPE_DATETIME2: case MYSQL_TYPE_TIME2: DBUG_RETURN(false); + case MYSQL_TYPE_NEWDATE: + { + if (field->real_type() == MYSQL_TYPE_DATETIME2) + { + *order_var= -1; + DBUG_RETURN(is_conversion_ok(*order_var, rli)); + } + else + { + DBUG_RETURN(false); + } + } + break; + case MYSQL_TYPE_DATETIME2: + { + if (field->real_type() == MYSQL_TYPE_NEWDATE) + { + *order_var= 1; + DBUG_RETURN(is_conversion_ok(*order_var, rli)); + } + else + { + DBUG_RETURN(false); + } + } + break; } DBUG_RETURN(false); // To keep GCC happy }

1 0

[Commits] 7e1bcb6b9ef: MDEV-17098 DATE -> DATETIME replication conversion not working, even in ALL_NON_LOSSY mode
by andrei.elkin＠pp.inet.fi 04 Oct '18

04 Oct '18

revision-id: 7e1bcb6b9ef0c7db3145d08036740b7518bfc5eb (mariadb-10.2.18-8-g7e1bcb6b9ef) parent(s): 753117fed043ac3200093c2dc28161ebce2cd04b author: Andrei Elkin committer: Andrei Elkin timestamp: 2018-10-04 15:32:15 +0300 message: MDEV-17098 DATE -> DATETIME replication conversion not working, even in ALL_NON_LOSSY mode Opened up MYSQL_TYPE DATETIME2 <-> DATE and DATETIME2 <-> TIME conversions for replication. --- mysql-test/suite/rpl/r/rpl_colSize.result | 114 ++++++++++++++++++++++++++ mysql-test/suite/rpl/r/rpl_row_colSize.result | 48 +++++++++++ mysql-test/suite/rpl/t/rpl_colSize.test | 102 +++++++++++++++++++++++ mysql-test/suite/rpl/t/rpl_row_colSize.test | 16 ++++ sql/rpl_utility.cc | 35 +++++++- 5 files changed, 311 insertions(+), 4 deletions(-) diff --git a/mysql-test/suite/rpl/r/rpl_colSize.result b/mysql-test/suite/rpl/r/rpl_colSize.result index 503bf85222e..4b19bd15631 100644 --- a/mysql-test/suite/rpl/r/rpl_colSize.result +++ b/mysql-test/suite/rpl/r/rpl_colSize.result @@ -189,6 +189,120 @@ t1 CREATE TABLE `t1` ( `d` bit(25) DEFAULT NULL, `e` bit(13) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 +Checking NON-LOSSY MYSQL_TYPE_DATE to MYSQL_TYPE_DATETIME +connection master; +DROP TABLE t1; +connection slave; +connection master; +CREATE TABLE t1 (a DATE); +SHOW CREATE TABLE t1; +Table Create Table +t1 CREATE TABLE `t1` ( + `a` date DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +connection slave; +ALTER TABLE t1 MODIFY a DATETIME(6); +SHOW CREATE TABLE t1; +Table Create Table +t1 CREATE TABLE `t1` ( + `a` datetime(6) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +connection master; +INSERT INTO t1 VALUES (current_date()), (current_date() + 1); +SELECT max(a) - min(a) as 'master: one' from t1; +master: one +1 +connection slave; +SELECT date(max(a)) - date(min(a)) as 'slave: 1' from t1; +slave: 1 +1 +Checking LOSSY MYSQL_TYPE_DATETIME to MYSQL_TYPE_DATE +SET @local_saved_slave_type_conversions = @@slave_type_conversions; +SET GLOBAL SLAVE_TYPE_CONVERSIONS = 'ALL_LOSSY'; +connection master; +DROP TABLE t1; +connection slave; +connection master; +CREATE TABLE t1 (a DATETIME(6)); +SHOW CREATE TABLE t1; +Table Create Table +t1 CREATE TABLE `t1` ( + `a` datetime(6) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +connection slave; +ALTER TABLE t1 MODIFY a DATE; +SHOW CREATE TABLE t1; +Table Create Table +t1 CREATE TABLE `t1` ( + `a` date DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +connection master; +INSERT INTO t1 VALUES (current_timestamp(6)), (date_add(current_timestamp(6), INTERVAL 1 day)); +SELECT date(max(a)) - date(min(a)) as 'master: one day' from t1; +master: one day +1 +connection slave; +SELECT max(a) - min(a) as 'slave: 1 day' from t1; +slave: 1 day +1 +SET GLOBAL SLAVE_TYPE_CONVERSIONS = @local_saved_slave_type_conversions; +Checking NON-LOSSY MYSQL_TYPE_TIME to MYSQL_TYPE_DATETIME +connection master; +DROP TABLE t1; +connection slave; +connection master; +CREATE TABLE t1 (a TIME); +SHOW CREATE TABLE t1; +Table Create Table +t1 CREATE TABLE `t1` ( + `a` time DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +connection slave; +ALTER TABLE t1 MODIFY a DATETIME(6); +SHOW CREATE TABLE t1; +Table Create Table +t1 CREATE TABLE `t1` ( + `a` datetime(6) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +connection master; +INSERT INTO t1 VALUES (current_time()), (current_time() + 1); +SELECT max(a) - min(a) as 'master: one second' from t1; +master: one second +1 +connection slave; +SELECT max(a) - min(a) as 'slave: 1.0 second' from t1; +slave: 1.0 second +1.000000 +Checking LOSSY MYSQL_TYPE_DATETIME to MYSQL_TYPE_TIME +SET @local_saved_slave_type_conversions = @@slave_type_conversions; +SET GLOBAL SLAVE_TYPE_CONVERSIONS = 'ALL_LOSSY'; +connection master; +DROP TABLE t1; +connection slave; +connection master; +CREATE TABLE t1 (a DATETIME(6)); +SHOW CREATE TABLE t1; +Table Create Table +t1 CREATE TABLE `t1` ( + `a` datetime(6) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +connection slave; +ALTER TABLE t1 MODIFY a TIME; +SHOW CREATE TABLE t1; +Table Create Table +t1 CREATE TABLE `t1` ( + `a` time DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +connection master; +INSERT INTO t1 VALUES (current_timestamp(6)), (date_add(current_timestamp(6), INTERVAL 1 second)); +SELECT max(a) - min(a) as 'master: one second' from t1; +master: one second +1.000000 +connection slave; +SELECT max(a) - min(a) as 'slave: 1 sec' from t1; +slave: 1 sec +1 +SET GLOBAL SLAVE_TYPE_CONVERSIONS = @local_saved_slave_type_conversions; *** Cleanup *** connection master; DROP TABLE t1; diff --git a/mysql-test/suite/rpl/r/rpl_row_colSize.result b/mysql-test/suite/rpl/r/rpl_row_colSize.result index dd324ef7807..97d5de20866 100644 --- a/mysql-test/suite/rpl/r/rpl_row_colSize.result +++ b/mysql-test/suite/rpl/r/rpl_row_colSize.result @@ -344,6 +344,54 @@ connection master; RESET MASTER; connection slave; START SLAVE; +Checking MYSQL_TYPE_DATETIME to MYSQL_TYPE_DATE +connection master; +DROP TABLE IF EXISTS t1; +connection slave; +STOP SLAVE; +RESET SLAVE; +CREATE TABLE t1 (a date); +connection master; +CREATE TABLE t1 (a datetime(6)); +RESET MASTER; +INSERT INTO t1 VALUES (current_date()); +connection slave; +START SLAVE; +include/wait_for_slave_sql_error.inc [errno=1677] +Last_SQL_Error = 'Column 0 of table 'test.t1' cannot be converted from type 'datetime' to type 'date'' +SELECT COUNT(*) FROM t1; +COUNT(*) +0 +STOP SLAVE; +RESET SLAVE; +connection master; +RESET MASTER; +connection slave; +START SLAVE; +Checking MYSQL_TYPE_DATETIME to MYSQL_TYPE_TIME +connection master; +DROP TABLE IF EXISTS t1; +connection slave; +STOP SLAVE; +RESET SLAVE; +CREATE TABLE t1 (a time); +connection master; +CREATE TABLE t1 (a datetime(6)); +RESET MASTER; +INSERT INTO t1 VALUES (current_date()); +connection slave; +START SLAVE; +include/wait_for_slave_sql_error.inc [errno=1677] +Last_SQL_Error = 'Column 0 of table 'test.t1' cannot be converted from type 'datetime' to type 'time'' +SELECT COUNT(*) FROM t1; +COUNT(*) +0 +STOP SLAVE; +RESET SLAVE; +connection master; +RESET MASTER; +connection slave; +START SLAVE; connection slave; call mtr.add_suppression("Slave SQL.*Table definition on master and slave does not match: Column 0 ...e mismatch.* error.* 1535"); call mtr.add_suppression("Slave SQL.*Column 0 of table .test.t1. cannot be converted from type.* error.* 1677"); diff --git a/mysql-test/suite/rpl/t/rpl_colSize.test b/mysql-test/suite/rpl/t/rpl_colSize.test index d6f817af189..02654484309 100644 --- a/mysql-test/suite/rpl/t/rpl_colSize.test +++ b/mysql-test/suite/rpl/t/rpl_colSize.test @@ -217,6 +217,108 @@ SELECT BIN(a), BIN(b), BIN(c), BIN(d), BIN(e) FROM t1; --replace_result default DEFAULT SHOW CREATE TABLE t1; +# +# Test: Checking MYSQL_TYPE _DATETIME to-from _DATE,TIME conversion +# +--echo Checking NON-LOSSY MYSQL_TYPE_DATE to MYSQL_TYPE_DATETIME +connection master; +DROP TABLE t1; +sync_slave_with_master slave; + +connection master; +CREATE TABLE t1 (a DATE); +--replace_result default DEFAULT +SHOW CREATE TABLE t1; + +sync_slave_with_master slave; +ALTER TABLE t1 MODIFY a DATETIME(6); +--replace_result default DEFAULT +SHOW CREATE TABLE t1; + +connection master; +INSERT INTO t1 VALUES (current_date()), (current_date() + 1); +SELECT max(a) - min(a) as 'master: one' from t1; + +sync_slave_with_master slave; +SELECT date(max(a)) - date(min(a)) as 'slave: 1' from t1; + + +--echo Checking LOSSY MYSQL_TYPE_DATETIME to MYSQL_TYPE_DATE +SET @local_saved_slave_type_conversions = @@slave_type_conversions; +SET GLOBAL SLAVE_TYPE_CONVERSIONS = 'ALL_LOSSY'; + +connection master; +DROP TABLE t1; +sync_slave_with_master slave; + +connection master; +CREATE TABLE t1 (a DATETIME(6)); +--replace_result default DEFAULT +SHOW CREATE TABLE t1; + +sync_slave_with_master slave; +ALTER TABLE t1 MODIFY a DATE; +--replace_result default DEFAULT +SHOW CREATE TABLE t1; + +connection master; +INSERT INTO t1 VALUES (current_timestamp(6)), (date_add(current_timestamp(6), INTERVAL 1 day)); +SELECT date(max(a)) - date(min(a)) as 'master: one day' from t1; + +sync_slave_with_master slave; +SELECT max(a) - min(a) as 'slave: 1 day' from t1; + +SET GLOBAL SLAVE_TYPE_CONVERSIONS = @local_saved_slave_type_conversions; + +--echo Checking NON-LOSSY MYSQL_TYPE_TIME to MYSQL_TYPE_DATETIME +connection master; +DROP TABLE t1; +sync_slave_with_master slave; + +connection master; +CREATE TABLE t1 (a TIME); +--replace_result default DEFAULT +SHOW CREATE TABLE t1; + +sync_slave_with_master slave; +ALTER TABLE t1 MODIFY a DATETIME(6); +--replace_result default DEFAULT +SHOW CREATE TABLE t1; + +connection master; +INSERT INTO t1 VALUES (current_time()), (current_time() + 1); +SELECT max(a) - min(a) as 'master: one second' from t1; + +sync_slave_with_master slave; +SELECT max(a) - min(a) as 'slave: 1.0 second' from t1; + +--echo Checking LOSSY MYSQL_TYPE_DATETIME to MYSQL_TYPE_TIME +SET @local_saved_slave_type_conversions = @@slave_type_conversions; +SET GLOBAL SLAVE_TYPE_CONVERSIONS = 'ALL_LOSSY'; + +connection master; +DROP TABLE t1; +sync_slave_with_master slave; + +connection master; +CREATE TABLE t1 (a DATETIME(6)); +--replace_result default DEFAULT +SHOW CREATE TABLE t1; + +sync_slave_with_master slave; +ALTER TABLE t1 MODIFY a TIME; +--replace_result default DEFAULT +SHOW CREATE TABLE t1; + +connection master; +INSERT INTO t1 VALUES (current_timestamp(6)), (date_add(current_timestamp(6), INTERVAL 1 second)); +SELECT max(a) - min(a) as 'master: one second' from t1; + +sync_slave_with_master slave; +SELECT max(a) - min(a) as 'slave: 1 sec' from t1; + +SET GLOBAL SLAVE_TYPE_CONVERSIONS = @local_saved_slave_type_conversions; + --echo *** Cleanup *** connection master; DROP TABLE t1; diff --git a/mysql-test/suite/rpl/t/rpl_row_colSize.test b/mysql-test/suite/rpl/t/rpl_row_colSize.test index 21c68b55e92..ebcfe55896e 100644 --- a/mysql-test/suite/rpl/t/rpl_row_colSize.test +++ b/mysql-test/suite/rpl/t/rpl_row_colSize.test @@ -160,6 +160,22 @@ let $test_table_slave = CREATE TABLE t1 (a TINYBLOB); let $test_insert = INSERT INTO t1 VALUES ('This is a test.'); source include/test_fieldsize.inc; +# +# Test: Checking MYSQL_TYPE_DATE* fields +# +--echo Checking MYSQL_TYPE_DATETIME to MYSQL_TYPE_DATE +let $test_table_master = CREATE TABLE t1 (a datetime(6)); +let $test_table_slave = CREATE TABLE t1 (a date); +let $test_insert = INSERT INTO t1 VALUES (current_date()); +source include/test_fieldsize.inc; + +--echo Checking MYSQL_TYPE_DATETIME to MYSQL_TYPE_TIME +let $test_table_master = CREATE TABLE t1 (a datetime(6)); +let $test_table_slave = CREATE TABLE t1 (a time); +let $test_insert = INSERT INTO t1 VALUES (current_date()); +source include/test_fieldsize.inc; + + connection slave; call mtr.add_suppression("Slave SQL.*Table definition on master and slave does not match: Column 0 ...e mismatch.* error.* 1535"); call mtr.add_suppression("Slave SQL.*Column 0 of table .test.t1. cannot be converted from type.* error.* 1677"); diff --git a/sql/rpl_utility.cc b/sql/rpl_utility.cc index bdf5b7dea80..b8fc2bc0b2d 100644 --- a/sql/rpl_utility.cc +++ b/sql/rpl_utility.cc @@ -626,7 +626,8 @@ can_convert_field_to(Field *field, (field->real_type() == MYSQL_TYPE_TIME2 && source_type == MYSQL_TYPE_TIME) || (field->real_type() == MYSQL_TYPE_DATETIME2 && - source_type == MYSQL_TYPE_DATETIME))) || + (source_type == MYSQL_TYPE_DATETIME || + source_type == MYSQL_TYPE_TIME2)))) || /* Conversion from MySQL56 TIMESTAMP(N), TIME(N), DATETIME(N) to the corresponding MariaDB or MySQL55 types is non-lossy. @@ -765,14 +766,40 @@ can_convert_field_to(Field *field, case MYSQL_TYPE_TIME: case MYSQL_TYPE_DATETIME: case MYSQL_TYPE_YEAR: - case MYSQL_TYPE_NEWDATE: case MYSQL_TYPE_NULL: case MYSQL_TYPE_ENUM: case MYSQL_TYPE_SET: + DBUG_RETURN(false); case MYSQL_TYPE_TIMESTAMP2: - case MYSQL_TYPE_DATETIME2: case MYSQL_TYPE_TIME2: - DBUG_RETURN(false); + case MYSQL_TYPE_NEWDATE: + { + if (field->real_type() == MYSQL_TYPE_DATETIME2) + { + *order_var= -1; + DBUG_RETURN(is_conversion_ok(*order_var, rli)); + } + else + { + DBUG_RETURN(false); + } + } + break; + case MYSQL_TYPE_DATETIME2: + { + if (field->real_type() == MYSQL_TYPE_NEWDATE || + field->real_type() == MYSQL_TYPE_TIMESTAMP2 || + field->real_type() == MYSQL_TYPE_TIME2) + { + *order_var= 1; + DBUG_RETURN(is_conversion_ok(*order_var, rli)); + } + else + { + DBUG_RETURN(false); + } + } + break; } DBUG_RETURN(false); // To keep GCC happy }

1 0

[Commits] e8559127332: Test by reverting MDEV-16656: DROP DATABASE crashes the Galera Cluster
by jan 04 Oct '18

04 Oct '18

revision-id: e855912733287d496cb2f429c8019005aaac9d0a (mariadb-10.1.35-77-ge8559127332) parent(s): 6c29544c20968bad607456dc94c4fd5bd787e9f6 author: Jan Lindström committer: Jan Lindström timestamp: 2018-10-04 13:29:29 +0300 message: Test by reverting MDEV-16656: DROP DATABASE crashes the Galera Cluster --- mysql-test/suite/galera/disabled.def | 3 ++- storage/innobase/fts/fts0fts.cc | 25 +++---------------------- storage/xtradb/fts/fts0fts.cc | 25 +++---------------------- 3 files changed, 8 insertions(+), 45 deletions(-) diff --git a/mysql-test/suite/galera/disabled.def b/mysql-test/suite/galera/disabled.def index efd02a14fec..603031f52b7 100644 --- a/mysql-test/suite/galera/disabled.def +++ b/mysql-test/suite/galera/disabled.def @@ -33,4 +33,5 @@ galera_gc_fc_limit : MDEV-17061 Test failure on galera.galera_gc_fc_limit partition : MDEV-13881 galera.partition failed in buildbot with wrong result galera_as_slave_replication_budle : MDEV-15785 Test case galera_as_slave_replication_bundle caused debug assertion galera_wan : MDEV-17259: Test failure on galera.galera_wan -#galera_pc_ignore_sb : MDEV-17357 Test failure on galera.galera_pc_ignore_sb +galera_pc_ignore_sb : MDEV-17357 Test failure on galera.galera_pc_ignore_sb +galera_drop_database : test diff --git a/storage/innobase/fts/fts0fts.cc b/storage/innobase/fts/fts0fts.cc index 04aaff96b91..a5b2bbb47ce 100644 --- a/storage/innobase/fts/fts0fts.cc +++ b/storage/innobase/fts/fts0fts.cc @@ -2762,7 +2762,7 @@ fts_cmp_set_sync_doc_id( mutex_enter(&cache->doc_id_lock); /* For each sync operation, we will add next_doc_id by 1, so to mark a sync operation */ - if (cache->next_doc_id <= cache->synced_doc_id) { + if (cache->next_doc_id < cache->synced_doc_id + 1) { cache->next_doc_id = cache->synced_doc_id + 1; } mutex_exit(&cache->doc_id_lock); @@ -6665,6 +6665,7 @@ fts_rename_aux_tables_to_hex_format( "All the fts index associated with the table are " "marked as corrupted. Please rebuild the " "index again.", parent_table->name); + fts_sql_rollback(trx_rename); /* Corrupting the fts index related to parent table. */ trx_t* trx_corrupt; @@ -7041,27 +7042,7 @@ fts_check_and_drop_orphaned_tables( /* If the aux table is in decimal format, we should rename it, so push it to aux_tables_to_rename */ if (!drop && rename) { - /* It is necessary to check that the table with - this name is missing in the vector - otherwise it - can be renamed twice: */ - bool rename_table = true; - for (ulint count = 0; - count < ib_vector_size(aux_tables_to_rename); - count++) { - fts_aux_table_t* rename_aux = - static_cast<fts_aux_table_t*>( - ib_vector_get(aux_tables_to_rename, - count)); - if (strcmp(rename_aux->name, - aux_table->name) == 0) { - rename_table = false; - break; - } - } - if (rename_table) { - ib_vector_push(aux_tables_to_rename, - aux_table); - } + ib_vector_push(aux_tables_to_rename, aux_table); } if (i + 1 < ib_vector_size(tables)) { diff --git a/storage/xtradb/fts/fts0fts.cc b/storage/xtradb/fts/fts0fts.cc index d5128955f56..5981c24c470 100644 --- a/storage/xtradb/fts/fts0fts.cc +++ b/storage/xtradb/fts/fts0fts.cc @@ -2761,7 +2761,7 @@ fts_cmp_set_sync_doc_id( mutex_enter(&cache->doc_id_lock); /* For each sync operation, we will add next_doc_id by 1, so to mark a sync operation */ - if (cache->next_doc_id <= cache->synced_doc_id) { + if (cache->next_doc_id < cache->synced_doc_id + 1) { cache->next_doc_id = cache->synced_doc_id + 1; } mutex_exit(&cache->doc_id_lock); @@ -6664,6 +6664,7 @@ fts_rename_aux_tables_to_hex_format( "All the fts index associated with the table are " "marked as corrupted. Please rebuild the " "index again.", parent_table->name); + fts_sql_rollback(trx_rename); /* Corrupting the fts index related to parent table. */ trx_t* trx_corrupt; @@ -7040,27 +7041,7 @@ fts_check_and_drop_orphaned_tables( /* If the aux table is in decimal format, we should rename it, so push it to aux_tables_to_rename */ if (!drop && rename) { - /* It is necessary to check that the table with - this name is missing in the vector - otherwise it - can be renamed twice: */ - bool rename_table = true; - for (ulint count = 0; - count < ib_vector_size(aux_tables_to_rename); - count++) { - fts_aux_table_t* rename_aux = - static_cast<fts_aux_table_t*>( - ib_vector_get(aux_tables_to_rename, - count)); - if (strcmp(rename_aux->name, - aux_table->name) == 0) { - rename_table = false; - break; - } - } - if (rename_table) { - ib_vector_push(aux_tables_to_rename, - aux_table); - } + ib_vector_push(aux_tables_to_rename, aux_table); } if (i + 1 < ib_vector_size(tables)) {

1 0

[Commits] 6c29544c209: Enable for staging tree.
by jan 04 Oct '18

04 Oct '18

revision-id: 6c29544c20968bad607456dc94c4fd5bd787e9f6 (mariadb-10.1.35-76-g6c29544c209) parent(s): 391b7f5bd190c3fcbaedf1128a6bc3e7f9981efe author: Jan Lindström committer: Jan Lindström timestamp: 2018-10-04 08:05:50 +0300 message: Enable for staging tree. --- mysql-test/suite/galera/disabled.def | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mysql-test/suite/galera/disabled.def b/mysql-test/suite/galera/disabled.def index 464ed6444f9..efd02a14fec 100644 --- a/mysql-test/suite/galera/disabled.def +++ b/mysql-test/suite/galera/disabled.def @@ -33,4 +33,4 @@ galera_gc_fc_limit : MDEV-17061 Test failure on galera.galera_gc_fc_limit partition : MDEV-13881 galera.partition failed in buildbot with wrong result galera_as_slave_replication_budle : MDEV-15785 Test case galera_as_slave_replication_bundle caused debug assertion galera_wan : MDEV-17259: Test failure on galera.galera_wan -galera_pc_ignore_sb : MDEV-17357 Test failure on galera.galera_pc_ignore_sb +#galera_pc_ignore_sb : MDEV-17357 Test failure on galera.galera_pc_ignore_sb

1 0