Commit 20763b0d authored by unknown's avatar unknown

sql/slave.cc

    fixed bad merge


sql/slave.cc:
  fixed bad merge
parent 2c15fdb5
...@@ -420,11 +420,10 @@ int fetch_nx_table(THD* thd, const char* db_name, const char* table_name, ...@@ -420,11 +420,10 @@ int fetch_nx_table(THD* thd, const char* db_name, const char* table_name,
goto err; goto err;
} }
} }
safe_connect(thd, mysql, mi);
if (slave_killed(thd)) if (slave_killed(thd))
goto err; goto err;
if (request_table_dump(mysql, thd->last_nx_db, thd->last_nx_table)) if (request_table_dump(mysql, db_name, table_name))
{ {
nx_errno = ER_GET_ERRNO; nx_errno = ER_GET_ERRNO;
sql_print_error("fetch_nx_table: failed on table dump request "); sql_print_error("fetch_nx_table: failed on table dump request ");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment