diff options
| author | unknown <sasha@mysql.sashanet.com> | 2001-06-29 09:55:21 -0600 |
|---|---|---|
| committer | unknown <sasha@mysql.sashanet.com> | 2001-06-29 09:55:21 -0600 |
| commit | 0a6cf93d23f42b3060b324b7f7a71cfcce7507f9 (patch) | |
| tree | ac0ec753f8980e75aeb9b64d300e0d91af7ea89c /sql/sql_repl.cc | |
| parent | 1ed2bcc8889f6b968c473044caaeefd603bb377b (diff) | |
| download | mariadb-git-0a6cf93d23f42b3060b324b7f7a71cfcce7507f9.tar.gz | |
post-merge fix
fixed bug in LOAD DATA FROM MASTER
BitKeeper/etc/ignore:
Added scripts/mysqld_safe to the ignore list
sql/mysqld.cc:
post-merge fix
Diffstat (limited to 'sql/sql_repl.cc')
| -rw-r--r-- | sql/sql_repl.cc | 5 |
1 files changed, 5 insertions, 0 deletions
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; } |