summaryrefslogtreecommitdiff
path: root/client
diff options
context:
space:
mode:
authorAlexey Kopytov <Alexey.Kopytov@sun.com>2009-05-08 21:24:15 +0400
committerAlexey Kopytov <Alexey.Kopytov@sun.com>2009-05-08 21:24:15 +0400
commit5390ad33f918c379ddd750295d7ec0014a03d1ce (patch)
treec91f8453c3e6396d6f1b36e71ebfa7851783ee2c /client
parentc5548ad7bdb8faa673c8455ebd4d98aad93b43eb (diff)
parentc0cd2742af13c90f117b563e368566ed489b1fca (diff)
downloadmariadb-git-5390ad33f918c379ddd750295d7ec0014a03d1ce.tar.gz
Manual merge.
Diffstat (limited to 'client')
-rw-r--r--client/mysqlbinlog.cc3
1 files changed, 1 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 ||