diff options
| author | sasha@mysql.sashanet.com <> | 2000-11-20 23:38:08 -0700 |
|---|---|---|
| committer | sasha@mysql.sashanet.com <> | 2000-11-20 23:38:08 -0700 |
| commit | 14854a669a13ba6984031bd969a02ff394f768ab (patch) | |
| tree | 050393cb70f23f2d613cf4a5f8134232f3a1b540 /sql/mysqld.cc | |
| parent | f8d9c2ad4372751db23d8bafca9e10289ff950bb (diff) | |
| download | mariadb-git-14854a669a13ba6984031bd969a02ff394f768ab.tar.gz | |
fixed warning in sql_class.cc
added gdb support, mysqld options per test, and other cool stuff to mysql-test-run
added --replicate-wild-do/ignore-table
more test cases
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 32 |
1 files changed, 29 insertions, 3 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index bbacf46dd01..8bb4cded39e 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -2231,7 +2231,7 @@ enum options { 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_REPL_WILD_DO_TABLE, OPT_REPL_WILD_IGNORE_TABLE + OPT_REPLICATE_WILD_DO_TABLE, OPT_REPLICATE_WILD_IGNORE_TABLE }; static struct option long_options[] = { @@ -2302,13 +2302,13 @@ static struct option long_options[] = { {"replicate-do-table", required_argument, 0, (int) OPT_REPLICATE_DO_TABLE}, {"replicate-wild-do-table", required_argument, 0, - (int) OPT_REPL_WILD_DO_TABLE}, + (int) OPT_REPLICATE_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}, + (int) OPT_REPLICATE_WILD_IGNORE_TABLE}, {"replicate-rewrite-db", required_argument, 0, (int) OPT_REPLICATE_REWRITE_DB}, {"safe-mode", no_argument, 0, (int) OPT_SAFE}, @@ -2961,6 +2961,32 @@ static void get_options(int argc,char **argv) table_rules_on = 1; break; } + case (int)OPT_REPLICATE_WILD_DO_TABLE: + { + if(!wild_do_table_inited) + init_table_rule_array(&replicate_wild_do_table, + &wild_do_table_inited); + if(add_wild_table_rule(&replicate_wild_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_WILD_IGNORE_TABLE: + { + if(!wild_ignore_table_inited) + init_table_rule_array(&replicate_wild_ignore_table, + &wild_ignore_table_inited); + if(add_wild_table_rule(&replicate_wild_ignore_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) |