Commit 65cd3204 authored by Alexey Kopytov's avatar Alexey Kopytov

Automerge.

parents 50d4a020 88370b7d
...@@ -1529,8 +1529,7 @@ static Exit_status dump_remote_log_entries(PRINT_EVENT_INFO *print_event_info, ...@@ -1529,8 +1529,7 @@ static Exit_status dump_remote_log_entries(PRINT_EVENT_INFO *print_event_info,
If reading from a remote host, ensure the temp_buf for the If reading from a remote host, ensure the temp_buf for the
Log_event class is pointing to the incoming stream. Log_event class is pointing to the incoming stream.
*/ */
if (remote_opt) ev->register_temp_buf((char *) net->read_pos + 1);
ev->register_temp_buf((char*) net->read_pos + 1);
Log_event_type type= ev->get_type_code(); Log_event_type type= ev->get_type_code();
if (glob_description_event->binlog_version >= 3 || if (glob_description_event->binlog_version >= 3 ||
......
...@@ -471,4 +471,7 @@ IS NOT NULL ...@@ -471,4 +471,7 @@ IS NOT NULL
1 1
*** Unsigned server_id 4294967295 is found: 1 *** *** Unsigned server_id 4294967295 is found: 1 ***
SET @@global.server_id= 1; SET @@global.server_id= 1;
RESET MASTER;
FLUSH LOGS;
End of 5.0 tests
End of 5.1 tests End of 5.1 tests
...@@ -367,4 +367,16 @@ echo *** Unsigned server_id $s_id_max is found: $s_id_unsigned ***; ...@@ -367,4 +367,16 @@ echo *** Unsigned server_id $s_id_max is found: $s_id_unsigned ***;
eval SET @@global.server_id= $save_server_id; eval SET @@global.server_id= $save_server_id;
--remove_file $binlog_file --remove_file $binlog_file
#
# Bug #41943: mysqlbinlog.exe crashes if --hexdump option is used
#
RESET MASTER;
FLUSH LOGS;
# We do not need the results, just make sure that mysqlbinlog does not crash
--exec $MYSQL_BINLOG --hexdump --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000001 >/dev/null
--echo End of 5.0 tests
--echo End of 5.1 tests --echo End of 5.1 tests
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment