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, 30 insertions, 1 deletions

diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index e9389727e9a..88a81f0fdeb 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -2230,7 +2230,8 @@ enum options {
 	       OPT_SKIP_CONCURRENT_INSERT, OPT_MEMLOCK, OPT_MYISAM_RECOVER,
 	       OPT_REPLICATE_REWRITE_DB, OPT_SERVER_ID, OPT_SKIP_SLAVE_START,
 	       OPT_SKIP_INNOBASE,OPT_SAFEMALLOC_MEM_LIMIT,
-	       OPT_REPLICATE_DO_TABLE, OPT_REPLICATE_IGNORE_TABLE
+	       OPT_REPLICATE_DO_TABLE, OPT_REPLICATE_IGNORE_TABLE,
+	       OPT_REPL_WILD_DO_TABLE, OPT_REPL_WILD_IGNORE_TABLE
 };
 
 static struct option long_options[] = {
@@ -2300,10 +2301,14 @@ static struct option long_options[] = {
   {"replicate-do-db",       required_argument, 0, (int) OPT_REPLICATE_DO_DB},
   {"replicate-do-table",       required_argument, 0,
    (int) OPT_REPLICATE_DO_TABLE},
+  {"replicate-wild-do-table",       required_argument, 0,
+   (int) OPT_REPL_WILD_DO_TABLE},
   {"replicate-ignore-db",   required_argument, 0,
    (int) OPT_REPLICATE_IGNORE_DB},
   {"replicate-ignore-table",   required_argument, 0,
    (int) OPT_REPLICATE_IGNORE_TABLE},
+  {"replicate-wild-ignore-table",   required_argument, 0,
+   (int) OPT_REPL_WILD_IGNORE_TABLE},
   {"replicate-rewrite-db",   required_argument, 0,
      (int) OPT_REPLICATE_REWRITE_DB},
   {"safe-mode",             no_argument,       0, (int) OPT_SAFE},
@@ -2938,6 +2943,30 @@ static void get_options(int argc,char **argv)
 	binlog_do_db.push_back(db);
         break;
       }
+    case (int)OPT_REPLICATE_DO_TABLE:
+      {
+	if(!do_table_inited)
+	  init_table_rule_hash(&replicate_do_table, &do_table_inited);
+	if(add_table_rule(&replicate_do_table, optarg))
+	  {
+	    fprintf(stderr, "could not add do table rule '%s'\n", optarg);
+	    exit(1);
+	  }
+	table_rules_on = 1;
+	break;
+      }
+    case (int)OPT_REPLICATE_IGNORE_TABLE:
+      {
+	if(!ignore_table_inited)
+	  init_table_rule_hash(&replicate_ignore_table, &ignore_table_inited);
+	if(add_table_rule(&replicate_ignore_table, optarg))
+	  {
+	    fprintf(stderr, "could not add ignore table rule '%s'\n", optarg);
+	    exit(1);
+	  }
+	table_rules_on = 1;
+	break;
+      }
     case (int) OPT_SQL_BIN_UPDATE_SAME:
       opt_sql_bin_update  = 1;
       break;