- commits - lists.mariadb.org

[Commits] a099284: MDEV-19851 server_audit plugin should not allow server_audit_output_type=SYSLOG on Windows.
by holyfoot＠askmonty.org 03 Jul '19

03 Jul '19

revision-id: a099284b716b07af0d196705f44b828d621943d2 (mariadb-10.1.39-80-ga099284) parent(s): bf37b9fce9fc1cfb3fe096bc50c15c1bf53cd629 committer: Alexey Botchkov timestamp: 2019-07-03 16:41:01 +0400 message: MDEV-19851 server_audit plugin should not allow server_audit_output_type=SYSLOG on Windows. 'syslog' output type disabled on Windows. --- plugin/server_audit/server_audit.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/plugin/server_audit/server_audit.c b/plugin/server_audit/server_audit.c index 3da5264..16a677e 100644 --- a/plugin/server_audit/server_audit.c +++ b/plugin/server_audit/server_audit.c @@ -26,6 +26,7 @@ #include <fcntl.h> #ifndef _WIN32 +#define DO_SYSLOG #include <syslog.h> #else #define syslog(PRIORITY, FORMAT, INFO, MESSAGE_LEN, MESSAGE) do {}while(0) @@ -384,17 +385,31 @@ static MYSQL_SYSVAR_SET(events, events, PLUGIN_VAR_RQCMDARG, "Specifies the set of events to monitor. Can be CONNECT, QUERY, TABLE," " QUERY_DDL, QUERY_DML, QUERY_DML_NO_SELECT, QUERY_DCL.", NULL, NULL, 0, &events_typelib); +#ifdef DO_SYSLOG #define OUTPUT_SYSLOG 0 #define OUTPUT_FILE 1 +#else +#define OUTPUT_SYSLOG 0xFFFF +#define OUTPUT_FILE 0 +#endif /*DO_SYSLOG*/ + #define OUTPUT_NO 0xFFFF -static const char *output_type_names[]= { "syslog", "file", 0 }; +static const char *output_type_names[]= { +#ifdef DO_SYSLOG + "syslog", +#endif + "file", 0 }; static TYPELIB output_typelib= { array_elements(output_type_names) - 1, "output_typelib", output_type_names, NULL }; static MYSQL_SYSVAR_ENUM(output_type, output_type, PLUGIN_VAR_RQCMDARG, +#ifdef DO_SYSLOG "Desired output type. Possible values - 'syslog', 'file'" +#else + "Desired output type. Possible values - 'file'" +#endif " or 'null' as no output.", 0, update_output_type, OUTPUT_FILE, &output_typelib); static MYSQL_SYSVAR_STR(file_path, file_path, PLUGIN_VAR_RQCMDARG,

1 0

[Commits] 7d580ad1417: MDEV-19936: MyRocks: compile fails on Windows
by Sergei Petrunia 03 Jul '19

03 Jul '19

revision-id: 7d580ad141764e3751922ac9d349ae92ac6dc409 (mariadb-10.3.16-21-g7d580ad1417) parent(s): 1d45b3b055511d58c1e820ad497793f30871586e author: Sergei Petrunia committer: Sergei Petrunia timestamp: 2019-07-03 10:58:40 +0300 message: MDEV-19936: MyRocks: compile fails on Windows Don't compile table/mock_table.cc (pushing this patch to 10.3 first to make sure it fixes the issue will push to 10.2, too) --- storage/rocksdb/build_rocksdb.cmake | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/storage/rocksdb/build_rocksdb.cmake b/storage/rocksdb/build_rocksdb.cmake index 561e6cdefe6..22ec9f324f6 100644 --- a/storage/rocksdb/build_rocksdb.cmake +++ b/storage/rocksdb/build_rocksdb.cmake @@ -171,7 +171,10 @@ set(LIBS ${ROCKSDB_LIBS} ${THIRDPARTY_LIBS} ${SYSTEM_LIBS}) #add_subdirectory(${ROCKSDB_SOURCE_DIR}/tools) # Main library source code - +# Note : table/mock_table.cc must not be in the below list as it causes +# compile warnings-treated-as-errors on Windows, and it is only used in +# RocksDB's tests. +# set(ROCKSDB_SOURCES cache/clock_cache.cc cache/lru_cache.cc @@ -298,7 +301,6 @@ set(ROCKSDB_SOURCES table/iterator.cc table/merging_iterator.cc table/meta_blocks.cc - table/mock_table.cc table/persistent_cache_helper.cc table/plain/plain_table_builder.cc table/plain/plain_table_factory.cc

1 0

[Commits] 7ab258ec112: MDEV-19370: rpl.kill_race_condition failed in buildbot with Wrong value for slave parameter
by sujatha 28 Jun '19

28 Jun '19

revision-id: 7ab258ec112ebfb389e1fd0bb6a8ff44c0fb6eca (mariadb-10.1.39-71-g7ab258ec112) parent(s): 7f2cfa8f47cf05d8dbea65ced3656fd0fc6efbf5 author: Sujatha committer: Sujatha timestamp: 2019-06-28 21:50:56 +0530 message: MDEV-19370: rpl.kill_race_condition failed in buildbot with Wrong value for slave parameter Problem: ======= Executing test with following options will result in test failure. ./mtr rpl.kill_race_condition{,,,,,,,,,,} --repeat=10 --par 12 --mem Fix: ==== Test simulates applier thread kill scenario while applying a row event. But it doesn't wait for applier to catch the error stop. Added :wait_for_slave_sql_error.inc to catch the error. Test uses START SLAVE as a final step and doesn't wait for both threads to start. Added: start_slave.inc --- mysql-test/suite/rpl/r/kill_race_condition.result | 9 ++++++--- mysql-test/suite/rpl/t/kill_race_condition.test | 17 ++++++++++++----- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/mysql-test/suite/rpl/r/kill_race_condition.result b/mysql-test/suite/rpl/r/kill_race_condition.result index e4e347dc786..48fd65e3a7c 100644 --- a/mysql-test/suite/rpl/r/kill_race_condition.result +++ b/mysql-test/suite/rpl/r/kill_race_condition.result @@ -1,13 +1,16 @@ include/master-slave.inc [connection master] -set global debug_dbug='d,rows_log_event_before_open_table'; -set debug_sync='now WAIT_FOR before_open_table'; create table t1 (a int); +set global debug_dbug='d,rows_log_event_before_open_table'; insert t1 values (1),(2),(3); +set debug_sync='now WAIT_FOR before_open_table'; kill slave_sql_thread; set debug_sync='now SIGNAL go_ahead_sql'; +include/wait_for_slave_sql_error.inc [errno=1927] +Last_SQL_Error = Error executing row event: 'Connection was killed' set global debug_dbug=''; set debug_sync='RESET'; drop table t1; -start slave; +include/start_slave.inc +Last_SQL_Error = include/rpl_end.inc diff --git a/mysql-test/suite/rpl/t/kill_race_condition.test b/mysql-test/suite/rpl/t/kill_race_condition.test index 4268c12cdbf..0f3b44864fe 100644 --- a/mysql-test/suite/rpl/t/kill_race_condition.test +++ b/mysql-test/suite/rpl/t/kill_race_condition.test @@ -2,27 +2,34 @@ source include/have_debug_sync.inc; source include/have_binlog_format_row.inc; source include/master-slave.inc; +connection master; +create table t1 (a int); +--sync_slave_with_master + connection slave; set global debug_dbug='d,rows_log_event_before_open_table'; -send set debug_sync='now WAIT_FOR before_open_table'; connection master; -create table t1 (a int); insert t1 values (1),(2),(3); connection slave; -reap; +set debug_sync='now WAIT_FOR before_open_table'; let $a=`select id from information_schema.processlist where state='debug sync point: now'`; replace_result $a slave_sql_thread; eval kill $a; set debug_sync='now SIGNAL go_ahead_sql'; +--let $slave_sql_errno= 1927 +--source include/wait_for_slave_sql_error.inc +let $error= query_get_value(SHOW SLAVE STATUS, Last_SQL_Error, 1); +--echo Last_SQL_Error = $error set global debug_dbug=''; set debug_sync='RESET'; - connection master; drop table t1; connection slave; -start slave; +--source include/start_slave.inc +let $error= query_get_value(SHOW SLAVE STATUS, Last_SQL_Error, 1); +--echo Last_SQL_Error = $error source include/rpl_end.inc;

1 0

[Commits] c56a8839dbf: MDEV-19834: Selectivity of an equality condition discounted twice
by Sergei Petrunia 28 Jun '19

28 Jun '19

revision-id: c56a8839dbf3bfc1fe0df7903eaf67e06c38329c (mariadb-10.4.5-94-gc56a8839dbf) parent(s): bb702c2e4c24632678b548ee1515c6a5b8173808 author: Sergei Petrunia committer: Sergei Petrunia timestamp: 2019-06-28 11:55:53 +0300 message: MDEV-19834: Selectivity of an equality condition discounted twice When discounting selectivity of ref access, don't discount the selectivity we've already discounted for range access. --- mysql-test/main/rowid_filter_innodb.result | 4 ++-- sql/sql_select.cc | 15 +++++++++------ 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/mysql-test/main/rowid_filter_innodb.result b/mysql-test/main/rowid_filter_innodb.result index d83239eb25f..390c7834a0a 100644 --- a/mysql-test/main/rowid_filter_innodb.result +++ b/mysql-test/main/rowid_filter_innodb.result @@ -2179,7 +2179,7 @@ count(*) 6 explain extended select count(*) from t1 where a in (22,83,11) and b=2; id select_type table type possible_keys key key_len ref rows filtered Extra -1 SIMPLE t1 ref b,a b 5 const 59 55.93 Using where +1 SIMPLE t1 ref b,a b 5 const 59 3.30 Using where Warnings: Note 1003 select count(0) AS `count(*)` from `test`.`t1` where `test`.`t1`.`b` = 2 and `test`.`t1`.`a` in (22,83,11) select * from t1 where a in (22,83,11) and b=2; @@ -2196,7 +2196,7 @@ count(*) 6 explain extended select count(*) from t1 where a in (22,83,11) and b=2; id select_type table type possible_keys key key_len ref rows filtered Extra -1 SIMPLE t1 ref|filter b,a b|a 5|5 const 59 (3%) 55.93 Using where; Using rowid filter +1 SIMPLE t1 ref|filter b,a b|a 5|5 const 59 (3%) 3.30 Using where; Using rowid filter Warnings: Note 1003 select count(0) AS `count(*)` from `test`.`t1` where `test`.`t1`.`b` = 2 and `test`.`t1`.`a` in (22,83,11) select * from t1 where a in (22,83,11) and b=2; diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 23827898160..e11aa991812 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -9028,6 +9028,7 @@ double table_cond_selectivity(JOIN *join, uint idx, JOIN_TAB *s, KEYUSE *keyuse= pos->key; KEYUSE *prev_ref_keyuse= keyuse; uint key= keyuse->key; + bool used_range_selectivity= false; /* Check if we have a prefix of key=const that matches a quick select. @@ -9053,6 +9054,7 @@ double table_cond_selectivity(JOIN *join, uint idx, JOIN_TAB *s, keyparts++; } sel /= (double)table->quick_rows[key] / (double) table->stat_records(); + used_range_selectivity= true; } } @@ -9088,13 +9090,14 @@ double table_cond_selectivity(JOIN *join, uint idx, JOIN_TAB *s, if (keyparts > keyuse->keypart) { /* Ok this is the keyuse that will be used for ref access */ - uint fldno; - if (is_hash_join_key_no(key)) - fldno= keyuse->keypart; - else - fldno= table->key_info[key].key_part[keyparts-1].fieldnr - 1; - if (keyuse->val->const_item()) + if (!used_range_selectivity && keyuse->val->const_item()) { + uint fldno; + if (is_hash_join_key_no(key)) + fldno= keyuse->keypart; + else + fldno= table->key_info[key].key_part[keyparts-1].fieldnr - 1; + if (table->field[fldno]->cond_selectivity > 0) { sel /= table->field[fldno]->cond_selectivity;

1 0

[Commits] 63e7837b1bd: Fix galera_as_slave_gtid.test galera_var_gtid_domain_id galera.mdev_10518.test
by sachin.setiya＠mariadb.com 27 Jun '19

27 Jun '19

revision-id: 63e7837b1bd1be0dbbba703d38f67cd4b0113ae8 (mariadb-10.1.39-72-g63e7837b1bd) parent(s): 85d23f0bd39dc76c7446bbae0b81379a4da18276 author: Sachin committer: Sachin timestamp: 2019-06-27 14:39:23 +0530 message: Fix galera_as_slave_gtid.test galera_var_gtid_domain_id galera.mdev_10518.test Clean the binlog on nodes after test is complete --- mysql-test/suite/galera/r/galera_as_slave_gtid.result | 4 ++++ mysql-test/suite/galera/r/galera_var_gtid_domain_id.result | 3 +++ mysql-test/suite/galera/r/mdev_10518.result | 3 +++ mysql-test/suite/galera/t/galera_as_slave_gtid.test | 10 ++++++++++ mysql-test/suite/galera/t/galera_var_gtid_domain_id.test | 7 +++++++ mysql-test/suite/galera/t/mdev_10518.test | 7 +++++++ 6 files changed, 34 insertions(+) diff --git a/mysql-test/suite/galera/r/galera_as_slave_gtid.result b/mysql-test/suite/galera/r/galera_as_slave_gtid.result index fbac7b1b6b5..db2bbf9ddaf 100644 --- a/mysql-test/suite/galera/r/galera_as_slave_gtid.result +++ b/mysql-test/suite/galera/r/galera_as_slave_gtid.result @@ -14,3 +14,7 @@ gtid_binlog_state_equal DROP TABLE t1; STOP SLAVE; RESET SLAVE ALL; +#cleanup +reset master; +reset master; +reset master; diff --git a/mysql-test/suite/galera/r/galera_var_gtid_domain_id.result b/mysql-test/suite/galera/r/galera_var_gtid_domain_id.result index 8e84236d5bf..0a9b699a8e1 100644 --- a/mysql-test/suite/galera/r/galera_var_gtid_domain_id.result +++ b/mysql-test/suite/galera/r/galera_var_gtid_domain_id.result @@ -71,4 +71,7 @@ wsrep_gtid_domain_id 9999 wsrep_gtid_mode 1 # On node_1 DROP TABLE t1, t2; +#cleanup +reset master; +reset master; # End of test diff --git a/mysql-test/suite/galera/r/mdev_10518.result b/mysql-test/suite/galera/r/mdev_10518.result index b2a3e0a65ef..f176c224ce9 100644 --- a/mysql-test/suite/galera/r/mdev_10518.result +++ b/mysql-test/suite/galera/r/mdev_10518.result @@ -71,4 +71,7 @@ wsrep_gtid_domain_id 4294967295 wsrep_gtid_mode 1 # On node_1 DROP TABLE t1, t2; +#cleanup +reset master; +reset master; # End of test diff --git a/mysql-test/suite/galera/t/galera_as_slave_gtid.test b/mysql-test/suite/galera/t/galera_as_slave_gtid.test index c2331a2ae05..a3c43540916 100644 --- a/mysql-test/suite/galera/t/galera_as_slave_gtid.test +++ b/mysql-test/suite/galera/t/galera_as_slave_gtid.test @@ -65,3 +65,13 @@ DROP TABLE t1; STOP SLAVE; RESET SLAVE ALL; + +--echo #cleanup +--connection node_1 +reset master; + +--connection node_2 +reset master; + +--connection node_3 +reset master; diff --git a/mysql-test/suite/galera/t/galera_var_gtid_domain_id.test b/mysql-test/suite/galera/t/galera_var_gtid_domain_id.test index c4127b4f655..015f25abf2f 100644 --- a/mysql-test/suite/galera/t/galera_var_gtid_domain_id.test +++ b/mysql-test/suite/galera/t/galera_var_gtid_domain_id.test @@ -48,6 +48,13 @@ source include/print_gtid.inc; # Cleanup DROP TABLE t1, t2; +--echo #cleanup +--connection node_1 +reset master; + +--connection node_2 +reset master; + --source include/galera_end.inc --echo # End of test diff --git a/mysql-test/suite/galera/t/mdev_10518.test b/mysql-test/suite/galera/t/mdev_10518.test index c4127b4f655..015f25abf2f 100644 --- a/mysql-test/suite/galera/t/mdev_10518.test +++ b/mysql-test/suite/galera/t/mdev_10518.test @@ -48,6 +48,13 @@ source include/print_gtid.inc; # Cleanup DROP TABLE t1, t2; +--echo #cleanup +--connection node_1 +reset master; + +--connection node_2 +reset master; + --source include/galera_end.inc --echo # End of test

1 0

[Commits] 0881a98cf26: Fix galera_var_gtid_domain_id
by sachin.setiya＠mariadb.com 27 Jun '19

27 Jun '19

revision-id: 0881a98cf2623b2dfa49c96a3a67d88b812c15fd (mariadb-10.1.39-73-g0881a98cf26) parent(s): 00be54e8daa6c6634173e76816a9150c6ef8e8ea author: Sachin committer: Sachin timestamp: 2019-06-27 14:19:21 +0530 message: Fix galera_var_gtid_domain_id Clean the binlog on nodes after test is complete --- mysql-test/suite/galera/r/galera_var_gtid_domain_id.result | 3 +++ mysql-test/suite/galera/t/galera_var_gtid_domain_id.test | 7 +++++++ 2 files changed, 10 insertions(+) diff --git a/mysql-test/suite/galera/r/galera_var_gtid_domain_id.result b/mysql-test/suite/galera/r/galera_var_gtid_domain_id.result index 8e84236d5bf..0a9b699a8e1 100644 --- a/mysql-test/suite/galera/r/galera_var_gtid_domain_id.result +++ b/mysql-test/suite/galera/r/galera_var_gtid_domain_id.result @@ -71,4 +71,7 @@ wsrep_gtid_domain_id 9999 wsrep_gtid_mode 1 # On node_1 DROP TABLE t1, t2; +#cleanup +reset master; +reset master; # End of test diff --git a/mysql-test/suite/galera/t/galera_var_gtid_domain_id.test b/mysql-test/suite/galera/t/galera_var_gtid_domain_id.test index c4127b4f655..015f25abf2f 100644 --- a/mysql-test/suite/galera/t/galera_var_gtid_domain_id.test +++ b/mysql-test/suite/galera/t/galera_var_gtid_domain_id.test @@ -48,6 +48,13 @@ source include/print_gtid.inc; # Cleanup DROP TABLE t1, t2; +--echo #cleanup +--connection node_1 +reset master; + +--connection node_2 +reset master; + --source include/galera_end.inc --echo # End of test

1 0

[Commits] 00be54e8daa: Fix galera_as_slave_gtid.test
by sachin.setiya＠mariadb.com 27 Jun '19

27 Jun '19

revision-id: 00be54e8daa6c6634173e76816a9150c6ef8e8ea (mariadb-10.1.39-72-g00be54e8daa) parent(s): 85d23f0bd39dc76c7446bbae0b81379a4da18276 author: Sachin committer: Sachin timestamp: 2019-06-27 12:45:59 +0530 message: Fix galera_as_slave_gtid.test Clean the binlog on nodes after test is complete --- mysql-test/suite/galera/r/galera_as_slave_gtid.result | 4 ++++ mysql-test/suite/galera/t/galera_as_slave_gtid.test | 10 ++++++++++ 2 files changed, 14 insertions(+) diff --git a/mysql-test/suite/galera/r/galera_as_slave_gtid.result b/mysql-test/suite/galera/r/galera_as_slave_gtid.result index fbac7b1b6b5..db2bbf9ddaf 100644 --- a/mysql-test/suite/galera/r/galera_as_slave_gtid.result +++ b/mysql-test/suite/galera/r/galera_as_slave_gtid.result @@ -14,3 +14,7 @@ gtid_binlog_state_equal DROP TABLE t1; STOP SLAVE; RESET SLAVE ALL; +#cleanup +reset master; +reset master; +reset master; diff --git a/mysql-test/suite/galera/t/galera_as_slave_gtid.test b/mysql-test/suite/galera/t/galera_as_slave_gtid.test index c2331a2ae05..a3c43540916 100644 --- a/mysql-test/suite/galera/t/galera_as_slave_gtid.test +++ b/mysql-test/suite/galera/t/galera_as_slave_gtid.test @@ -65,3 +65,13 @@ DROP TABLE t1; STOP SLAVE; RESET SLAVE ALL; + +--echo #cleanup +--connection node_1 +reset master; + +--connection node_2 +reset master; + +--connection node_3 +reset master;

1 0

[Commits] 85d23f0bd39: Fix galera_sync_wait_show.test
by sachin.setiya＠mariadb.com 27 Jun '19

27 Jun '19

revision-id: 85d23f0bd39dc76c7446bbae0b81379a4da18276 (mariadb-10.1.39-71-g85d23f0bd39) parent(s): abba70496923f21410aa78a85bc227a96cfd6cfe author: Sachin committer: Sachin timestamp: 2019-06-27 11:16:05 +0530 message: Fix galera_sync_wait_show.test Since the purpose of event is just to see on second node whether it is created or not And we are not goint to execute the event also. So instead of setting GLOBAL event_scheduler=ON and then turning it off, we can just disable the warning. --- mysql-test/suite/galera/t/galera_sync_wait_show.test | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mysql-test/suite/galera/t/galera_sync_wait_show.test b/mysql-test/suite/galera/t/galera_sync_wait_show.test index 58de5433030..79a1b6ad479 100644 --- a/mysql-test/suite/galera/t/galera_sync_wait_show.test +++ b/mysql-test/suite/galera/t/galera_sync_wait_show.test @@ -63,7 +63,9 @@ DROP TABLE t1; --connection node_1 +--disable_warnings CREATE EVENT event1 ON SCHEDULE AT '2038-01-01 23:59:59' DO SELECT 1; +--enable_warnings --connection node_2 SHOW CREATE EVENT event1;

1 0

[Commits] aa55d93cde4: Fix galera_log_output_csv.test
by sachin.setiya＠mariadb.com 26 Jun '19

26 Jun '19

revision-id: aa55d93cde4da10ea5848b90314d1e0263f5fa43 (mariadb-10.1.39-69-gaa55d93cde4) parent(s): d36c107a6b7f9e9bc9425072f2ac13afd2334069 author: Sachin committer: Sachin timestamp: 2019-06-26 15:06:34 +0530 message: Fix galera_log_output_csv.test Truncate the mysql.slow_log table after test is complete. --- mysql-test/suite/galera/r/galera_log_output_csv.result | 2 ++ mysql-test/suite/galera/t/galera_log_output_csv.test | 2 ++ 2 files changed, 4 insertions(+) diff --git a/mysql-test/suite/galera/r/galera_log_output_csv.result b/mysql-test/suite/galera/r/galera_log_output_csv.result index cdb5ee49f3e..24b7dc2b35d 100644 --- a/mysql-test/suite/galera/r/galera_log_output_csv.result +++ b/mysql-test/suite/galera/r/galera_log_output_csv.result @@ -16,3 +16,5 @@ SELECT COUNT(*) = 1 FROM mysql.slow_log WHERE sql_text = 'SELECT 2 = 2 FROM t1'; COUNT(*) = 1 1 DROP TABLE t1; +truncate table mysql.slow_log; +truncate table mysql.general_log; diff --git a/mysql-test/suite/galera/t/galera_log_output_csv.test b/mysql-test/suite/galera/t/galera_log_output_csv.test index 94ae3dd6168..eeccc953187 100644 --- a/mysql-test/suite/galera/t/galera_log_output_csv.test +++ b/mysql-test/suite/galera/t/galera_log_output_csv.test @@ -22,3 +22,5 @@ SELECT COUNT(*) = 1 FROM mysql.slow_log WHERE sql_text = 'SELECT 2 = 2 FROM t1'; --connection node_1 DROP TABLE t1; +truncate table mysql.slow_log; +truncate table mysql.general_log;

1 0

[Commits] abba7049692: Fix galera_log_bin
by sachin.setiya＠mariadb.com 26 Jun '19

26 Jun '19

revision-id: abba70496923f21410aa78a85bc227a96cfd6cfe (mariadb-10.1.39-70-gabba7049692) parent(s): aa55d93cde4da10ea5848b90314d1e0263f5fa43 author: Sachin committer: Sachin timestamp: 2019-06-26 19:42:05 +0530 message: Fix galera_log_bin Call reset master on node_2 also. There are three more issues. 1. instead of show_binlog_events we are doing manual replace on nodes , which is not a good idea. 2. Mask bin log file name in show_binlog_events, because On first run file name is XXX003 on second run file name is XXX001. 3. One first run on node_1 there is binlog_checkpoint event while on subsequent runs there is no checkopoint event. --- mysql-test/include/show_binlog_events.inc | 5 ++ mysql-test/include/show_events.inc | 1 + mysql-test/suite/galera/r/galera_log_bin.result | 81 ++++++++++++------------- mysql-test/suite/galera/t/galera_log_bin.test | 24 +++++--- 4 files changed, 61 insertions(+), 50 deletions(-) diff --git a/mysql-test/include/show_binlog_events.inc b/mysql-test/include/show_binlog_events.inc index 57fe1ffe0e3..70d5412c645 100644 --- a/mysql-test/include/show_binlog_events.inc +++ b/mysql-test/include/show_binlog_events.inc @@ -26,6 +26,11 @@ # Limit for the 'LIMIT' clause of SHOW BINLOG EVENTS, i.e.: # $binlog_limit= 3 -- print three events # $binlog_limit= 4, 3 -- skip four events, print the three next events +# +# $additional_filter #In the form of s{a}{b}; +# Apply more filter to show_binlog_events result + + --let $include_filename= show_binlog_events.inc --source include/begin_include_file.inc diff --git a/mysql-test/include/show_events.inc b/mysql-test/include/show_events.inc index 9ee01f73999..c8ff7fea2a8 100644 --- a/mysql-test/include/show_events.inc +++ b/mysql-test/include/show_events.inc @@ -102,6 +102,7 @@ let $script= s{((?:master|slave|slave-relay)-bin\.[0-9]{6};pos=)[0-9]+DOLLAR}{DOLLAR1POS}; s{SONAME ".*"}{SONAME "LIB"}; s{DOLLARmysqltest_vardir}{MYSQLTEST_VARDIR}g; + $additional_filter; || --let $pre_script= my DOLLARmysqltest_vardir = DOLLARENV{'MYSQLTEST_VARDIR'}; diff --git a/mysql-test/suite/galera/r/galera_log_bin.result b/mysql-test/suite/galera/r/galera_log_bin.result index 4772f347375..2d73b70369b 100644 --- a/mysql-test/suite/galera/r/galera_log_bin.result +++ b/mysql-test/suite/galera/r/galera_log_bin.result @@ -10,50 +10,47 @@ SELECT COUNT(*) = 2 FROM t2; COUNT(*) = 2 1 ALTER TABLE t1 ADD COLUMN f2 INTEGER; -FLUSH LOGS; -SHOW BINLOG EVENTS IN 'mysqld-bin.000002' LIMIT 4,18; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info -mysqld-bin.000002 # Gtid # # GTID 0-1-1 -mysqld-bin.000002 # Query # # use `test`; CREATE TABLE t1 (id INT PRIMARY KEY) ENGINE=InnoDB -mysqld-bin.000002 # Gtid # # BEGIN GTID 0-1-2 -mysqld-bin.000002 # Table_map # # table_id: # (test.t1) -mysqld-bin.000002 # Write_rows_v1 # # table_id: # flags: STMT_END_F -mysqld-bin.000002 # Xid # # COMMIT /* xid=# */ -mysqld-bin.000002 # Gtid # # GTID 0-1-3 -mysqld-bin.000002 # Query # # use `test`; CREATE TABLE t2 (id INT) ENGINE=InnoDB -mysqld-bin.000002 # Gtid # # BEGIN GTID 0-1-4 -mysqld-bin.000002 # Table_map # # table_id: # (test.t2) -mysqld-bin.000002 # Write_rows_v1 # # table_id: # flags: STMT_END_F -mysqld-bin.000002 # Xid # # COMMIT /* xid=# */ -mysqld-bin.000002 # Gtid # # BEGIN GTID 0-1-5 -mysqld-bin.000002 # Table_map # # table_id: # (test.t2) -mysqld-bin.000002 # Write_rows_v1 # # table_id: # flags: STMT_END_F -mysqld-bin.000002 # Xid # # COMMIT /* xid=# */ -mysqld-bin.000002 # Gtid # # GTID 0-1-6 -mysqld-bin.000002 # Query # # use `test`; ALTER TABLE t1 ADD COLUMN f2 INTEGER -SELECT COUNT(*) = 2 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 't1'; -COUNT(*) = 2 -1 -SHOW BINLOG EVENTS IN 'mysqld-bin.000003' LIMIT 3,18; +mysqld-bin.# # Gtid # # GTID #-#-# +mysqld-bin.# # Query # # use `test`; CREATE TABLE t1 (id INT PRIMARY KEY) ENGINE=InnoDB +mysqld-bin.# # Gtid # # BEGIN GTID #-#-# +mysqld-bin.# # Table_map # # table_id: # (test.t1) +mysqld-bin.# # Write_rows_v1 # # table_id: # flags: STMT_END_F +mysqld-bin.# # Xid # # COMMIT /* XID */ +mysqld-bin.# # Gtid # # GTID #-#-# +mysqld-bin.# # Query # # use `test`; CREATE TABLE t2 (id INT) ENGINE=InnoDB +mysqld-bin.# # Gtid # # BEGIN GTID #-#-# +mysqld-bin.# # Table_map # # table_id: # (test.t2) +mysqld-bin.# # Write_rows_v1 # # table_id: # flags: STMT_END_F +mysqld-bin.# # Xid # # COMMIT /* XID */ +mysqld-bin.# # Gtid # # BEGIN GTID #-#-# +mysqld-bin.# # Table_map # # table_id: # (test.t2) +mysqld-bin.# # Write_rows_v1 # # table_id: # flags: STMT_END_F +mysqld-bin.# # Xid # # COMMIT /* XID */ +mysqld-bin.# # Gtid # # GTID #-#-# +mysqld-bin.# # Query # # use `test`; ALTER TABLE t1 ADD COLUMN f2 INTEGER +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info -mysqld-bin.000003 # Gtid # # GTID 0-1-1 -mysqld-bin.000003 # Query # # use `test`; CREATE TABLE t1 (id INT PRIMARY KEY) ENGINE=InnoDB -mysqld-bin.000003 # Gtid # # BEGIN GTID 0-1-2 -mysqld-bin.000003 # Table_map # # table_id: # (test.t1) -mysqld-bin.000003 # Write_rows_v1 # # table_id: # flags: STMT_END_F -mysqld-bin.000003 # Xid # # COMMIT /* xid=# */ -mysqld-bin.000003 # Gtid # # GTID 0-1-3 -mysqld-bin.000003 # Query # # use `test`; CREATE TABLE t2 (id INT) ENGINE=InnoDB -mysqld-bin.000003 # Gtid # # BEGIN GTID 0-1-4 -mysqld-bin.000003 # Table_map # # table_id: # (test.t2) -mysqld-bin.000003 # Write_rows_v1 # # table_id: # flags: STMT_END_F -mysqld-bin.000003 # Xid # # COMMIT /* xid=# */ -mysqld-bin.000003 # Gtid # # BEGIN GTID 0-1-5 -mysqld-bin.000003 # Table_map # # table_id: # (test.t2) -mysqld-bin.000003 # Write_rows_v1 # # table_id: # flags: STMT_END_F -mysqld-bin.000003 # Xid # # COMMIT /* xid=# */ -mysqld-bin.000003 # Gtid # # GTID 0-1-6 -mysqld-bin.000003 # Query # # use `test`; ALTER TABLE t1 ADD COLUMN f2 INTEGER +mysqld-bin.# # Gtid # # GTID #-#-# +mysqld-bin.# # Query # # use `test`; CREATE TABLE t1 (id INT PRIMARY KEY) ENGINE=InnoDB +mysqld-bin.# # Gtid # # BEGIN GTID #-#-# +mysqld-bin.# # Table_map # # table_id: # (test.t1) +mysqld-bin.# # Write_rows_v1 # # table_id: # flags: STMT_END_F +mysqld-bin.# # Xid # # COMMIT /* XID */ +mysqld-bin.# # Gtid # # GTID #-#-# +mysqld-bin.# # Query # # use `test`; CREATE TABLE t2 (id INT) ENGINE=InnoDB +mysqld-bin.# # Gtid # # BEGIN GTID #-#-# +mysqld-bin.# # Table_map # # table_id: # (test.t2) +mysqld-bin.# # Write_rows_v1 # # table_id: # flags: STMT_END_F +mysqld-bin.# # Xid # # COMMIT /* XID */ +mysqld-bin.# # Gtid # # BEGIN GTID #-#-# +mysqld-bin.# # Table_map # # table_id: # (test.t2) +mysqld-bin.# # Write_rows_v1 # # table_id: # flags: STMT_END_F +mysqld-bin.# # Xid # # COMMIT /* XID */ +mysqld-bin.# # Gtid # # GTID #-#-# +mysqld-bin.# # Query # # use `test`; ALTER TABLE t1 ADD COLUMN f2 INTEGER DROP TABLE t1; DROP TABLE t2; RESET MASTER; +RESET MASTER; diff --git a/mysql-test/suite/galera/t/galera_log_bin.test b/mysql-test/suite/galera/t/galera_log_bin.test index d2d3987d711..0516b0d3f14 100644 --- a/mysql-test/suite/galera/t/galera_log_bin.test +++ b/mysql-test/suite/galera/t/galera_log_bin.test @@ -21,19 +21,27 @@ SELECT COUNT(*) = 2 FROM t2; --connection node_1 ALTER TABLE t1 ADD COLUMN f2 INTEGER; -FLUSH LOGS; ---replace_column 2 # 4 # 5 # ---replace_regex /table_id: [0-9]+/table_id: #/ /xid=[0-9]+/xid=#/ -SHOW BINLOG EVENTS IN 'mysqld-bin.000002' LIMIT 4,18; +--let $MASTER_MYPORT=$NODE_MYPORT_1 +--let $binlog_file = query_get_value(show master status,File,1) +--delimiter || +let $additional_filter = s{mysqld-bin\.[0-9]+}{mysqld-bin\.#}; + next if /.*Binlog_checkpoint.*/;|| +--delimiter ; +--source include/show_binlog_events.inc --connection node_2 -SELECT COUNT(*) = 2 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 't1'; ---replace_column 2 # 4 # 5 # ---replace_regex /table_id: [0-9]+/table_id: #/ /xid=[0-9]+/xid=#/ -SHOW BINLOG EVENTS IN 'mysqld-bin.000003' LIMIT 3,18; +--let $binlog_file = query_get_value(show master status,File,1) +--delimiter || +let $additional_filter = s{mysqld-bin\.[0-9]+}{mysqld-bin\.#}; + next if /.*Binlog_checkpoint.*/;|| +--delimiter ; +--source include/show_binlog_events.inc DROP TABLE t1; DROP TABLE t2; --connection node_1 RESET MASTER; + +--connection node_2 +RESET MASTER;

1 0