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

1 files changed, 2 insertions, 3 deletions

diff --git a/sql/sql_table.cc b/sql/sql_table.cc
index bcc0e4257f2..3c7e5c3d180 100644
--- a/sql/sql_table.cc
+++ b/sql/sql_table.cc
@@ -67,8 +67,7 @@ int mysql_rm_table(THD *thd,TABLE_LIST *tables, my_bool if_exists)
          error = 1;
 	 goto err;
 	}
-      while (global_read_lock && ! thd->killed ||
-	     thd->version != refresh_version)
+      while (global_read_lock && ! thd->killed)
       {
 	(void) pthread_cond_wait(&COND_refresh,&LOCK_open);
       }
@@ -156,7 +155,7 @@ int mysql_rm_table(THD *thd,TABLE_LIST *tables, my_bool if_exists)
   if (wrong_tables.length())
   {
     my_error(ER_BAD_TABLE_ERROR,MYF(0),wrong_tables.c_ptr());
-    DBUG_RETURN(-1);
+    error=1;
   }
   if(error)
     DBUG_RETURN(-1);