Merge with 4.0.18

1 files changed, 3 insertions, 1 deletions

diff --git a/sql/log_event.h b/sql/log_event.h
index d615c0e361b..1a5f0543766 100644
--- a/sql/log_event.h
+++ b/sql/log_event.h
@@ -564,17 +564,19 @@ public:
   const char* fname;
   uint32 skip_lines;
   sql_ex_info sql_ex;
+  bool local_fname;
 
   /* fname doesn't point to memory inside Log_event::temp_buf  */
   void set_fname_outside_temp_buf(const char *afname, uint alen)
   {
     fname= afname;
     fname_len= alen;
+    local_fname= true;
   }
   /* fname doesn't point to memory inside Log_event::temp_buf  */
   int  check_fname_outside_temp_buf()
   {
-    return fname < temp_buf || fname > temp_buf+ cached_event_len;
+    return local_fname;
   }
 
 #ifndef MYSQL_CLIENT