Commit b25b2b24 authored by Alexander Barkov's avatar Alexander Barkov
Browse files

Additional fix for bug#31455 (rpl decoder) 

- Implementing --base64-format=decode-rows, to display
  SQL-alike decoded row events without their BINLOG statements.
- Adding --base64-format=decode-rows into tests when
  calling mysqlbinlog to avoid non-deterministic results
- Removing resetting of last_table_id in "RESET MASTER",
  which appeared to be dangerous.
parent a57aa6bb

client/mysqlbinlog.cc

+2 −1
Original line number Diff line number Diff line
@@ -64,7 +64,8 @@ static void warning(const char *format, ...) ATTRIBUTE_FORMAT(printf, 1, 2); 


static bool one_database=0, to_last_remote_log= 0, disable_log_bin= 0;

static bool opt_hexdump= 0;

const char *base64_output_mode_names[]= {"NEVER", "AUTO", "ALWAYS", NullS};

const char *base64_output_mode_names[]=

{"NEVER", "AUTO", "ALWAYS", "UNSPEC", "DECODE-ROWS", NullS};

TYPELIB base64_output_mode_typelib=

  { array_elements(base64_output_mode_names) - 1, "",

    base64_output_mode_names, NULL };

mysql-test/include/mysqlbinlog_row_engine.inc

+8 −8
Original line number Diff line number Diff line
@@ -1650,8 +1650,8 @@ FLUSH LOGS; 
--echo #

let $MYSQLD_DATADIR= `select @@datadir`;

--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR

--replace_regex /SQL_LOAD_MB-[0-9]-[0-9]/SQL_LOAD_MB-#-#/ /exec_time=[0-9]*/exec_time=#/ /end_log_pos [0-9]*/end_log_pos #/ /# at [0-9]*/# at #/ /Xid = [0-9]*/Xid = #/ /thread_id=[0-9]*/thread_id=#/

--exec $MYSQL_BINLOG -v -v $MYSQLTEST_VARDIR/log/master-bin.000001

--replace_regex /SQL_LOAD_MB-[0-9]-[0-9]/SQL_LOAD_MB-#-#/ /exec_time=[0-9]*/exec_time=#/ /end_log_pos [0-9]*/end_log_pos #/ /# at [0-9]*/# at #/ /Xid = [0-9]*/Xid = #/ /thread_id=[0-9]*/thread_id=#/ /table id [0-9]*/table id #/ /mapped to number [0-9]*/mapped to number #/

--exec $MYSQL_BINLOG --base64-output=decode-rows -v -v $MYSQLTEST_VARDIR/log/master-bin.000001



--echo #

--echo # Cleanup.
@@ -1730,8 +1730,8 @@ FLUSH LOGS; 
--echo #

let $MYSQLD_DATADIR= `select @@datadir`;

--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR

--replace_regex /SQL_LOAD_MB-[0-9]-[0-9]/SQL_LOAD_MB-#-#/ /exec_time=[0-9]*/exec_time=#/ /end_log_pos [0-9]*/end_log_pos #/ /# at [0-9]*/# at #/ /Xid = [0-9]*/Xid = #/ /thread_id=[0-9]*/thread_id=#/

--exec $MYSQL_BINLOG -v -v $MYSQLTEST_VARDIR/log/master-bin.000001

--replace_regex /SQL_LOAD_MB-[0-9]-[0-9]/SQL_LOAD_MB-#-#/ /exec_time=[0-9]*/exec_time=#/ /end_log_pos [0-9]*/end_log_pos #/ /# at [0-9]*/# at #/ /Xid = [0-9]*/Xid = #/ /thread_id=[0-9]*/thread_id=#/ /table id [0-9]*/table id #/ /mapped to number [0-9]*/mapped to number #/

--exec $MYSQL_BINLOG --base64-output=decode-rows -v -v $MYSQLTEST_VARDIR/log/master-bin.000001



--echo #

--echo # Cleanup.
@@ -1853,8 +1853,8 @@ FLUSH LOGS; 
--echo #

let $MYSQLD_DATADIR= `select @@datadir`;

--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR

--replace_regex /SQL_LOAD_MB-[0-9]-[0-9]/SQL_LOAD_MB-#-#/ /exec_time=[0-9]*/exec_time=#/ /end_log_pos [0-9]*/end_log_pos #/ /# at [0-9]*/# at #/ /Xid = [0-9]*/Xid = #/ /thread_id=[0-9]*/thread_id=#/

--exec $MYSQL_BINLOG -v -v $MYSQLTEST_VARDIR/log/master-bin.000001

--replace_regex /SQL_LOAD_MB-[0-9]-[0-9]/SQL_LOAD_MB-#-#/ /exec_time=[0-9]*/exec_time=#/ /end_log_pos [0-9]*/end_log_pos #/ /# at [0-9]*/# at #/ /Xid = [0-9]*/Xid = #/ /thread_id=[0-9]*/thread_id=#/ /table id [0-9]*/table id #/ /mapped to number [0-9]*/mapped to number #/

--exec $MYSQL_BINLOG --base64-output=decode-rows -v -v $MYSQLTEST_VARDIR/log/master-bin.000001



--echo #

--echo # Cleanup.
@@ -1911,8 +1911,8 @@ FLUSH LOGS; 
--echo #

let $MYSQLD_DATADIR= `select @@datadir`;

--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR

--replace_regex /SQL_LOAD_MB-[0-9]-[0-9]/SQL_LOAD_MB-#-#/ /exec_time=[0-9]*/exec_time=#/ /end_log_pos [0-9]*/end_log_pos #/ /# at [0-9]*/# at #/ /Xid = [0-9]*/Xid = #/ /thread_id=[0-9]*/thread_id=#/

--exec $MYSQL_BINLOG -v -v $MYSQLTEST_VARDIR/log/master-bin.000001

--replace_regex /SQL_LOAD_MB-[0-9]-[0-9]/SQL_LOAD_MB-#-#/ /exec_time=[0-9]*/exec_time=#/ /end_log_pos [0-9]*/end_log_pos #/ /# at [0-9]*/# at #/ /Xid = [0-9]*/Xid = #/ /thread_id=[0-9]*/thread_id=#/ /table id [0-9]*/table id #/ /mapped to number [0-9]*/mapped to number #/

--exec $MYSQL_BINLOG --base64-output=decode-rows -v -v $MYSQLTEST_VARDIR/log/master-bin.000001



--echo #

--echo # Cleanup.

mysql-test/r/mysqlbinlog_row.result

+357 −1445

File changed.

Preview size limit exceeded, changes collapsed.

mysql-test/r/mysqlbinlog_row_innodb.result

+49 −1062

File changed.

Preview size limit exceeded, changes collapsed.

mysql-test/r/mysqlbinlog_row_myisam.result

+49 −1062

File changed.

Preview size limit exceeded, changes collapsed.