diff options
author | Alexey Kopytov <Alexey.Kopytov@sun.com> | 2009-05-08 21:24:15 +0400 |
---|---|---|
committer | Alexey Kopytov <Alexey.Kopytov@sun.com> | 2009-05-08 21:24:15 +0400 |
commit | cc281ae4b71c9682f796365fc79db05f4df23824 (patch) | |
tree | c91f8453c3e6396d6f1b36e71ebfa7851783ee2c /client | |
parent | 57d7b8267b02ce9a21255b20678e0b33bd2af18b (diff) | |
parent | 37d8a0475c281050cee45dc2489e2bbd557336f7 (diff) | |
download | mariadb-git-cc281ae4b71c9682f796365fc79db05f4df23824.tar.gz |
Manual merge.
Diffstat (limited to 'client')
-rw-r--r-- | client/mysqlbinlog.cc | 3 |
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 || |