diff options
| author | unknown <monty@mashka.mysql.fi> | 2003-01-25 15:07:51 +0200 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2003-01-25 15:07:51 +0200 |
| commit | 6337190c2bd2d1d47948f4d1b467970db7d5b2f6 (patch) | |
| tree | ec47c385448c97b6f07f4d2851b745236f7e98dd /sql/slave.h | |
| parent | f0a1a571b330a9ca87f81992cdbf8272bcb08934 (diff) | |
| download | mariadb-git-6337190c2bd2d1d47948f4d1b467970db7d5b2f6.tar.gz | |
Added timeout for wait_for_master_pos
Fixed comparision of log-binary name to handle comparison when file name extension wraps from .999 to .1000
Don't replicate CREATE/DROP DATABASE if wild_xxx_table=database.% is used.
mysql-test/r/rpl000009.result:
Fixed replication test after fixing replication of DROP/CREATE DATABASE
mysql-test/t/rpl000009.test:
Fixed replication test after fixing replication of DROP/CREATE DATABASE
sql/item_create.cc:
Added timeout for wait_for_master_pos
sql/item_create.h:
Added timeout for wait_for_master_pos
sql/item_func.cc:
Added timeout for wait_for_master_pos
sql/item_func.h:
Added timeout for wait_for_master_pos
sql/lex.h:
Added timeout for wait_for_master_pos
sql/slave.h:
Added timeout for wait_for_master_pos
Don't replicate CREATE/DROP DATABASE if wild_xxx_table=database.% is used.
sql/sql_parse.cc:
Don't replicate CREATE/DROP DATABASE if wild_xxx_table=database.% is used.
sql/sql_repl.cc:
Fixed comparision of log-binary name to handle comparison when file name extension wraps from .999 to .1000
Diffstat (limited to 'sql/slave.h')
| -rw-r--r-- | sql/slave.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/slave.h b/sql/slave.h index cb368ad26b1..72ddcd8b471 100644 --- a/sql/slave.h +++ b/sql/slave.h @@ -226,7 +226,8 @@ typedef struct st_relay_log_info pthread_mutex_unlock(&data_lock); } - int wait_for_pos(THD* thd, String* log_name, ulonglong log_pos); + int wait_for_pos(THD* thd, String* log_name, longlong log_pos, + longlong timeout); } RELAY_LOG_INFO; @@ -390,6 +391,7 @@ int tables_ok(THD* thd, TABLE_LIST* tables); */ int db_ok(const char* db, I_List<i_string> &do_list, I_List<i_string> &ignore_list ); +int db_ok_with_wild_table(const char *db); int add_table_rule(HASH* h, const char* table_spec); int add_wild_table_rule(DYNAMIC_ARRAY* a, const char* table_spec); |