Commit 12b442b6 authored by sasha@mysql.sashanet.com's avatar sasha@mysql.sashanet.com
Browse files

post-merge fix 

fixed bug in LOAD DATA FROM MASTER
parent 24203799

.bzrignore

+1 −0
Original line number Diff line number Diff line
@@ -370,3 +370,4 @@ libmysqld/stacktrace.c 
sql/share/mysql

.gdbinit

.vimrc

scripts/mysqld_safe

sql/mysqld.cc

+1 −1
Original line number Diff line number Diff line
@@ -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[] = {

sql/sql_repl.cc

+5 −0
Original line number Diff line number Diff line
@@ -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;

    }