merging 5.1 main -> rpl+2. Some manual work required mostly due to bug46640

1 files changed, 3 insertions, 3 deletions

diff --git a/sql/log_event.h b/sql/log_event.h
index de171145acd..cd5e659c910 100644
--- a/sql/log_event.h
+++ b/sql/log_event.h
@@ -1981,15 +1981,15 @@ private:
 class Load_log_event: public Log_event
 {
 private:
-  uint get_query_buffer_length();
-  void print_query(bool need_db, char *buf, char **end,
-                   char **fn_start, char **fn_end);
 protected:
   int copy_log_event(const char *buf, ulong event_len,
                      int body_offset,
                      const Format_description_log_event* description_event);
 
 public:
+  uint get_query_buffer_length();
+  void print_query(bool need_db, const char *cs, char *buf, char **end,
+                   char **fn_start, char **fn_end);
   ulong thread_id;
   ulong slave_proxy_id;
   uint32 table_name_len;