Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/4.1

into eagle.mysql.r18.ru:/home/vva/work/BINLOG_LOADDATA/4.1.clear

1 files changed, 8 insertions, 0 deletions

diff --git a/sql/log_event.h b/sql/log_event.h
index 80c448e1550..8046d0abb92 100644
--- a/sql/log_event.h
+++ b/sql/log_event.h
@@ -447,6 +447,13 @@ public:
   uint32 skip_lines;
   sql_ex_info sql_ex;
 
+  /* 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;}
+  /* 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;}
+
 #ifndef MYSQL_CLIENT
   String field_lens_buf;
   String fields_buf;
@@ -690,6 +697,7 @@ public:
   int exec_event(struct st_relay_log_info* rli);
 #else
   void print(FILE* file, bool short_form = 0, char* last_db = 0);
+  void print(FILE* file, bool short_form, char* last_db, bool enable_local);
 #endif  
   
   Create_file_log_event(const char* buf, int event_len, bool old_format);