repl-tests/test-repl-ts/repl-timestamp.master.reject

    this file needs to be deleted
sql/log_event.cc
    fixed warnings
sql/log_event.h
    fixed () #define bug
sql/mysqlbinlog.cc
    fixed length argument - was supposed to be one less
sql/mysqld.cc
    replicate-do/ignore-table now works, wild does not yet
sql/mysql_priv.h
    updating argument to add_table_to_list() -- needed for replicate-do/ignore table
sql/slave.cc
    changes fore replicate-do/ignore-table
    close the socket before going to sleep sleeping after error
    bad event was being freed too early
sql/slave.h
    changes for replicate-do/ignore-table
sql/sql_class.cc
    slave_thread variable to THD
sql/sql_class.h
    added slave_thread to THD, fixed bug in end_time()
sql/sql_parse.cc
    updating argument to add_tables_to_list()
sql/sql_table.cc
    fixed bug in mysql_rm_table()
sql/sql_yacc.yy
    fixed up add_table_to_list() calls to accept updating argument
sql/table.h
    added updating to TABLE_LIST


repl-tests/test-repl-ts/repl-timestamp.master.reject:
  this file needs to be deleted
sql/log_event.cc:
  fixed warnings
sql/log_event.h:
  fixed () #define bug
sql/mysql_priv.h:
  updating argument to add_table_to_list() -- needed for replicate-do/ignore table
sql/mysqlbinlog.cc:
  fixed length argument - was supposed to be one less
sql/mysqld.cc:
  replicate-do/ignore-table now works, wild does not yet
sql/slave.cc:
  changes fore replicate-do/ignore-table
  close the socket before going to sleep sleeping after error
  bad event was being freed too early
sql/slave.h:
  changes for replicate-do/ignore-table
sql/sql_class.cc:
  slave_thread variable to THD
sql/sql_class.h:
  added slave_thread to THD, fixed bug in end_time()
sql/sql_parse.cc:
  updating argument to add_tables_to_list()
sql/sql_table.cc:
  fixed bug in mysql_rm_table()
sql/sql_yacc.yy:
  fixed up add_table_to_list() calls to accept updating argument
sql/table.h:
  added updating to TABLE_LIST

1 files changed, 2 insertions, 1 deletions

diff --git a/sql/sql_class.h b/sql/sql_class.h
index e53ce950c1f..aef4c2c5c42 100644
--- a/sql/sql_class.h
+++ b/sql/sql_class.h
@@ -262,6 +262,7 @@ public:
   pthread_t  real_id;
   uint	current_tablenr,tmp_table,cond_count,col_access,query_length;
   uint  server_status,open_options;
+  bool       slave_thread;
   char	     scramble[9];
   bool	     set_query_id,locked,count_cuted_fields,some_tables_deleted;
   bool	     no_errors, allow_sum_func, password, fatal_error;
@@ -278,7 +279,7 @@ public:
   bool store_globals();
   inline time_t query_start() { query_start_used=1; return start_time; }
   inline void	set_time()    { if (!user_time) time_after_lock=time(&start_time); }
-  inline void	end_time()    { time(&start_time); }
+  inline void	end_time()    { if(!user_time) time(&start_time); }
   inline void	set_time(time_t t) { time_after_lock=start_time=t; user_time=1; }
   inline void	lock_time()   { time(&time_after_lock); }
   inline void	insert_id(ulonglong id)