- commits - lists.mariadb.org

[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

[Commits] 391b7f5bd19: Fix typo.
by jan 04 Oct '18

04 Oct '18

revision-id: 391b7f5bd190c3fcbaedf1128a6bc3e7f9981efe (mariadb-10.1.35-75-g391b7f5bd19) parent(s): e2a1c58582ac25af0af0621a2c32d822a5e9cecc author: Jan Lindström committer: Jan Lindström timestamp: 2018-10-04 08:04:55 +0300 message: Fix typo. --- mysql-test/suite/galera/disabled.def | 2 +- mysql-test/suite/galera/t/galera_pc_ignore_sb.test | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/mysql-test/suite/galera/disabled.def b/mysql-test/suite/galera/disabled.def index 9a686b560b2..464ed6444f9 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_pic_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 diff --git a/mysql-test/suite/galera/t/galera_pc_ignore_sb.test b/mysql-test/suite/galera/t/galera_pc_ignore_sb.test index 6ae2079577f..c48ddc66bdf 100644 --- a/mysql-test/suite/galera/t/galera_pc_ignore_sb.test +++ b/mysql-test/suite/galera/t/galera_pc_ignore_sb.test @@ -41,10 +41,11 @@ SET GLOBAL wsrep_cluster_address = @wsrep_cluster_address_orig; --connection node_2 --source include/start_mysqld.inc + +--connection node_1 --let $wait_condition = SELECT VARIABLE_VALUE = 2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size' --source include/wait_condition.inc ---connection node_1 SET GLOBAL wsrep_provider_options = @wsrep_provider_options_orig; # Restore original auto_increment_offset values.

1 0

[Commits] 0d302102ae0: Disable.
by jan 04 Oct '18

04 Oct '18

revision-id: 0d302102ae0ddc886a1472e4f06536b4ce67788e (mariadb-10.1.35-77-g0d302102ae0) parent(s): 36cadd41d172022d87bff282f04d3b99a0fcf0d0 author: Jan Lindström committer: Jan Lindström timestamp: 2018-10-04 07:11:52 +0300 message: Disable. --- 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 92e45cc0f25..9a686b560b2 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_pic_ignore_sb : MDEV-17357 Test failure on galera.galera_pc_ignore_sb

1 0

[Commits] 36cadd41d17: Add one more wait so that both nodes are up before environment
by jan 03 Oct '18

03 Oct '18

revision-id: 36cadd41d172022d87bff282f04d3b99a0fcf0d0 (mariadb-10.1.35-76-g36cadd41d17) parent(s): 880820f977c84f44a8155bc0f929138b95e0a9d3 author: Jan Lindström committer: Jan Lindström timestamp: 2018-10-03 17:56:02 +0300 message: Add one more wait so that both nodes are up before environment reset. --- mysql-test/suite/galera/r/galera_pc_ignore_sb.result | 4 ++++ mysql-test/suite/galera/t/galera_pc_ignore_sb.test | 15 +++++++++------ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/mysql-test/suite/galera/r/galera_pc_ignore_sb.result b/mysql-test/suite/galera/r/galera_pc_ignore_sb.result index ca0b260fb0c..81892a6cb38 100644 --- a/mysql-test/suite/galera/r/galera_pc_ignore_sb.result +++ b/mysql-test/suite/galera/r/galera_pc_ignore_sb.result @@ -1,3 +1,5 @@ +SET @wsrep_cluster_address_orig = @@GLOBAL.wsrep_cluster_address; +SET @wsrep_provider_options_orig = @@GLOBAL.wsrep_provider_options; SET GLOBAL wsrep_provider_options ='pc.ignore_sb=true'; Killing server ... CREATE TABLE t1 (f1 INTEGER) ENGINE=InnoDB; @@ -10,3 +12,5 @@ SELECT VARIABLE_VALUE = 'ON' FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABL VARIABLE_VALUE = 'ON' 1 SET GLOBAL wsrep_cluster_address = ''; +SET GLOBAL wsrep_cluster_address = @wsrep_cluster_address_orig; +SET GLOBAL wsrep_provider_options = @wsrep_provider_options_orig; diff --git a/mysql-test/suite/galera/t/galera_pc_ignore_sb.test b/mysql-test/suite/galera/t/galera_pc_ignore_sb.test index c45f3256d78..6ae2079577f 100644 --- a/mysql-test/suite/galera/t/galera_pc_ignore_sb.test +++ b/mysql-test/suite/galera/t/galera_pc_ignore_sb.test @@ -11,8 +11,8 @@ --source include/auto_increment_offset_save.inc --connection node_1 ---let $wsrep_cluster_address_orig = `SELECT @@wsrep_cluster_address` ---let $wsrep_provider_options_orig = `SELECT @@wsrep_provider_options` +SET @wsrep_cluster_address_orig = @@GLOBAL.wsrep_cluster_address; +SET @wsrep_provider_options_orig = @@GLOBAL.wsrep_provider_options; --let $wait_condition = SELECT VARIABLE_VALUE = 2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size' --source include/wait_condition.inc @@ -36,14 +36,17 @@ SELECT VARIABLE_VALUE = 'ON' FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABL # Reset the master and restart the slave so that post-test checks can run SET GLOBAL wsrep_cluster_address = ''; ---disable_query_log ---eval SET GLOBAL wsrep_cluster_address = '$wsrep_cluster_address_orig'; ---eval SET GLOBAL wsrep_provider_options ='$wsrep_provider_options_orig'; ---enable_query_log +SET GLOBAL wsrep_cluster_address = @wsrep_cluster_address_orig; --connection node_2 --source include/start_mysqld.inc +--let $wait_condition = SELECT VARIABLE_VALUE = 2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size' +--source include/wait_condition.inc + +--connection node_1 +SET GLOBAL wsrep_provider_options = @wsrep_provider_options_orig; + # Restore original auto_increment_offset values. --source include/auto_increment_offset_restore.inc

1 0

[Commits] 0f97f6b8398: MDEV-17346 parallel slave start and stop races to workers disappeared
by andrei.elkin＠pp.inet.fi 03 Oct '18

03 Oct '18

revision-id: 0f97f6b8398054ccb0507fbacc76c9deeddd47a4 (mariadb-10.1.35-71-g0f97f6b8398) parent(s): 1fc5a6f30c3a9c047dcf9a36b00026d98f286f6b author: Andrei Elkin committer: Andrei Elkin timestamp: 2018-10-03 15:42:12 +0300 message: MDEV-17346 parallel slave start and stop races to workers disappeared The bug appears as a slave SQL thread hanging in rpl_parallel_thread_pool::get_thread() while there are no slave worker threads to awake it. The hang could occur at parallel slave worker pool activation by a "new" started SQL thread when the pool was concurrently deactivated by being terminated "old" SQL thread. At reading the current pool size the SQL thread did not employ necessary protection designed by MDEV-9573. The pool can't be deactivated when there is an active slave but the "new" slave might set its active status too late while seeing the pool still non-empty. The end product of four computaional events Old_slave:any_slave_sql_running() => 0 New_slave:slave_running= "active" New_slave:global_rpl_thread_pool.size > 0 => true Old_slave:global_rpl_thread_pool.size := 0 could led to the observed hang. The new SQL thread proceeds to scheduling having all workers gone. Fixed with making the SQL thread at the pool activation first to grab the same lock as potential deactivator also does prior to destroy the pool. --- sql/rpl_parallel.cc | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/sql/rpl_parallel.cc b/sql/rpl_parallel.cc index 35cddee6d4d..8fef2d66635 100644 --- a/sql/rpl_parallel.cc +++ b/sql/rpl_parallel.cc @@ -1617,13 +1617,32 @@ int rpl_parallel_resize_pool_if_no_slaves(void) } +/** + Pool activation is preceeded by taking a "lock" of pool_mark_busy + which guarantees the number of running slaves drops to zero atomicly + with the number of pool workers. + This resolves race between the function caller thread and one + that may be attempting to deactivate the pool. +*/ int rpl_parallel_activate_pool(rpl_parallel_thread_pool *pool) { + int rc= 0; + + if ((rc= pool_mark_busy(pool, current_thd))) + return rc; // killed + if (!pool->count) - return rpl_parallel_change_thread_count(pool, opt_slave_parallel_threads, - 0); - return 0; + { + pool_mark_not_busy(pool); + rc= rpl_parallel_change_thread_count(pool, opt_slave_parallel_threads, + 0); + } + else + { + pool_mark_not_busy(pool); + } + return rc; }

1 0

[Commits] 880820f977c: Add wait until cluster has correct number of nodes.
by jan 03 Oct '18

03 Oct '18

revision-id: 880820f977c84f44a8155bc0f929138b95e0a9d3 (mariadb-10.1.35-75-g880820f977c) parent(s): 6dff1cfdca947315c0857074c3e9ca075402f90c author: Jan Lindström committer: Jan Lindström timestamp: 2018-10-03 13:45:05 +0300 message: Add wait until cluster has correct number of nodes. --- mysql-test/suite/galera/r/galera_pc_ignore_sb.result | 2 +- mysql-test/suite/galera/t/galera_pc_ignore_sb.test | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/mysql-test/suite/galera/r/galera_pc_ignore_sb.result b/mysql-test/suite/galera/r/galera_pc_ignore_sb.result index 5fcccfe2d59..ca0b260fb0c 100644 --- a/mysql-test/suite/galera/r/galera_pc_ignore_sb.result +++ b/mysql-test/suite/galera/r/galera_pc_ignore_sb.result @@ -1,4 +1,4 @@ -SET GLOBAL wsrep_provider_options = 'pc.ignore_sb=true'; +SET GLOBAL wsrep_provider_options ='pc.ignore_sb=true'; Killing server ... CREATE TABLE t1 (f1 INTEGER) ENGINE=InnoDB; INSERT INTO t1 VALUES (1); diff --git a/mysql-test/suite/galera/t/galera_pc_ignore_sb.test b/mysql-test/suite/galera/t/galera_pc_ignore_sb.test index 60efb88906f..c45f3256d78 100644 --- a/mysql-test/suite/galera/t/galera_pc_ignore_sb.test +++ b/mysql-test/suite/galera/t/galera_pc_ignore_sb.test @@ -14,7 +14,10 @@ --let $wsrep_cluster_address_orig = `SELECT @@wsrep_cluster_address` --let $wsrep_provider_options_orig = `SELECT @@wsrep_provider_options` -SET GLOBAL wsrep_provider_options = 'pc.ignore_sb=true'; +--let $wait_condition = SELECT VARIABLE_VALUE = 2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size' +--source include/wait_condition.inc + +SET GLOBAL wsrep_provider_options ='pc.ignore_sb=true'; --connection node_2 --source include/kill_galera.inc

1 0

[Commits] b173e883f7f: MDEV-16656: DROP DATABASE crashes the Galera Cluster
by jan 03 Oct '18

03 Oct '18

revision-id: b173e883f7fd4929c1504db69c09feb6d8fca2ed (mariadb-10.1.35-75-gb173e883f7f) parent(s): 6dff1cfdca947315c0857074c3e9ca075402f90c author: Jan Lindström committer: Jan Lindström timestamp: 2018-10-03 10:24:33 +0300 message: MDEV-16656: DROP DATABASE crashes the Galera Cluster Restore incorrectly removed call fts_sql_rollback(trx_rename); --- storage/innobase/fts/fts0fts.cc | 1 + storage/xtradb/fts/fts0fts.cc | 1 + 2 files changed, 2 insertions(+) diff --git a/storage/innobase/fts/fts0fts.cc b/storage/innobase/fts/fts0fts.cc index 04aaff96b91..4aeb2746d48 100644 --- a/storage/innobase/fts/fts0fts.cc +++ b/storage/innobase/fts/fts0fts.cc @@ -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; diff --git a/storage/xtradb/fts/fts0fts.cc b/storage/xtradb/fts/fts0fts.cc index d5128955f56..cc7f4f20267 100644 --- a/storage/xtradb/fts/fts0fts.cc +++ b/storage/xtradb/fts/fts0fts.cc @@ -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;

1 0

[Commits] 6dff1cfdca9: Fix test failure on wsrep.variables
by jan 03 Oct '18

03 Oct '18

revision-id: 6dff1cfdca947315c0857074c3e9ca075402f90c (mariadb-10.1.35-74-g6dff1cfdca9) parent(s): 87ecddcbdffbd3a221b38b4e8ab7e06af0af52a1 author: Jan Lindström committer: Jan Lindström timestamp: 2018-10-03 08:58:23 +0300 message: Fix test failure on wsrep.variables SLES11 can't build currently latest Galera library version. --- mysql-test/suite/wsrep/t/variables.test | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mysql-test/suite/wsrep/t/variables.test b/mysql-test/suite/wsrep/t/variables.test index 15104b9b654..1a2ab2579a5 100644 --- a/mysql-test/suite/wsrep/t/variables.test +++ b/mysql-test/suite/wsrep/t/variables.test @@ -30,7 +30,7 @@ CALL mtr.add_suppression("WSREP: Could not open saved state file for reading.*") --disable_result_log --disable_query_log eval SET GLOBAL wsrep_provider= '$WSREP_PROVIDER'; ---let $galera_version=25.3.17 +--let $galera_version=25.3.24 source include/check_galera_version.inc; --enable_result_log --enable_query_log

1 0