1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

post-merge fix

Browse Source 
fixed bug in LOAD DATA FROM MASTER


BitKeeper/etc/ignore:
  Added scripts/mysqld_safe to the ignore list
sql/mysqld.cc:
  post-merge fix
This commit is contained in:
unknown 2001-06-29 09:55:21 -06:00
parent 1ed2bcc888
commit 0a6cf93d23
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.bzrignore
View File

@ -370,3 +370,4 @@ libmysqld/stacktrace.c
sql/share/mysql sql/share/mysql
.gdbinit .gdbinit
.vimrc .vimrc
scripts/mysqld_safe

2
sql/mysqld.cc
View File

@ -2487,7 +2487,7 @@ enum options {
OPT_GEMINI_UNBUFFERED_IO, OPT_SKIP_SAFEMALLOC, OPT_GEMINI_UNBUFFERED_IO, OPT_SKIP_SAFEMALLOC,
OPT_SKIP_STACK_TRACE, OPT_SKIP_SYMLINK, OPT_REPORT_HOST, OPT_SKIP_STACK_TRACE, OPT_SKIP_SYMLINK, OPT_REPORT_HOST,
OPT_REPORT_USER, OPT_REPORT_PASSWORD, OPT_REPORT_PORT, 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}; OPT_SHOW_SLAVE_AUTH_INFO};
static struct option long_options[] = { static struct option long_options[] = {

5
sql/sql_repl.cc
View File

@ -37,6 +37,10 @@ int max_binlog_dump_events = 0; // unlimited
bool opt_sporadic_binlog_dump_fail = 0; bool opt_sporadic_binlog_dump_fail = 0;
static int binlog_dump_count = 0; static int binlog_dump_count = 0;
#endif #endif
static uint32* slave_list_key(SLAVE_INFO* si, uint* len,
my_bool not_used __attribute__((unused)))
{
*len = 4; *len = 4;
return &si->server_id; 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.next = 0;
table.db = (char*)db; table.db = (char*)db;
table.real_name = (char*)table_name; table.real_name = (char*)table_name;
table.updating = 1;
if(!tables_ok(thd, &table)) if(!tables_ok(thd, &table))
continue; continue;
} }