diff options
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/mysqld.cc | 2 | ||||
| -rw-r--r-- | sql/sql_repl.cc | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 7c9cf11aca0..f1f7344b195 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -2487,7 +2487,7 @@ enum options { OPT_GEMINI_UNBUFFERED_IO, OPT_SKIP_SAFEMALLOC, OPT_SKIP_STACK_TRACE, OPT_SKIP_SYMLINK, OPT_REPORT_HOST, OPT_REPORT_USER, OPT_REPORT_PASSWORD, OPT_REPORT_PORT, - OPT_MAX_BINLOG_DUMP_EVENTS, OPT_SPORADIC_BINLOG_DUMP, + OPT_MAX_BINLOG_DUMP_EVENTS, OPT_SPORADIC_BINLOG_DUMP_FAIL, OPT_SHOW_SLAVE_AUTH_INFO}; static struct option long_options[] = { diff --git a/sql/sql_repl.cc b/sql/sql_repl.cc index 95473888566..6153c4bd0f9 100644 --- a/sql/sql_repl.cc +++ b/sql/sql_repl.cc @@ -37,6 +37,10 @@ int max_binlog_dump_events = 0; // unlimited bool opt_sporadic_binlog_dump_fail = 0; static int binlog_dump_count = 0; #endif + +static uint32* slave_list_key(SLAVE_INFO* si, uint* len, + my_bool not_used __attribute__((unused))) +{ *len = 4; return &si->server_id; } @@ -1143,6 +1147,7 @@ static inline int fetch_db_tables(THD* thd, MYSQL* mysql, const char* db, table.next = 0; table.db = (char*)db; table.real_name = (char*)table_name; + table.updating = 1; if(!tables_ok(thd, &table)) continue; } |