diff options
| author | Alexey Kopytov <Alexey.Kopytov@sun.com> | 2009-05-08 21:50:04 +0400 |
|---|---|---|
| committer | Alexey Kopytov <Alexey.Kopytov@sun.com> | 2009-05-08 21:50:04 +0400 |
| commit | c63a916dce2fedb2b3c69edb5a7c53b9b3ebdd19 (patch) | |
| tree | 5beaaf789b7ce1faccb700fe00a196b188db9677 | |
| parent | 04eb28f1e63b55da20ef430daec0a7ac96df5c83 (diff) | |
| parent | 5390ad33f918c379ddd750295d7ec0014a03d1ce (diff) | |
| download | mariadb-git-c63a916dce2fedb2b3c69edb5a7c53b9b3ebdd19.tar.gz | |
Automerge.
| -rw-r--r-- | client/mysqlbinlog.cc | 3 | ||||
| -rw-r--r-- | mysql-test/r/mysqlbinlog.result | 3 | ||||
| -rw-r--r-- | mysql-test/t/mysqlbinlog.test | 12 |
3 files changed, 16 insertions, 2 deletions
diff --git a/client/mysqlbinlog.cc b/client/mysqlbinlog.cc index 1621db5ded8..1864786e3c6 100644 --- a/client/mysqlbinlog.cc +++ b/client/mysqlbinlog.cc @@ -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 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(); if (glob_description_event->binlog_version >= 3 || diff --git a/mysql-test/r/mysqlbinlog.result b/mysql-test/r/mysqlbinlog.result index b55a96b6f30..295a2f41d40 100644 --- a/mysql-test/r/mysqlbinlog.result +++ b/mysql-test/r/mysqlbinlog.result @@ -471,4 +471,7 @@ IS NOT NULL 1 *** Unsigned server_id 4294967295 is found: 1 *** SET @@global.server_id= 1; +RESET MASTER; +FLUSH LOGS; +End of 5.0 tests End of 5.1 tests diff --git a/mysql-test/t/mysqlbinlog.test b/mysql-test/t/mysqlbinlog.test index 46060649784..7767abe43d0 100644 --- a/mysql-test/t/mysqlbinlog.test +++ b/mysql-test/t/mysqlbinlog.test @@ -367,4 +367,16 @@ echo *** Unsigned server_id $s_id_max is found: $s_id_unsigned ***; eval SET @@global.server_id= $save_server_id; --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 |