Commit 57a7162f authored by unknown's avatar unknown

sql/slave.cc

    cosmetic change
sql/slave.cc@1.49
    cosmetic change


sql/slave.cc:
  cosmetic change
parent bc7aaafc
...@@ -683,7 +683,8 @@ static int exec_event(THD* thd, NET* net, MASTER_INFO* mi, int event_len) ...@@ -683,7 +683,8 @@ static int exec_event(THD* thd, NET* net, MASTER_INFO* mi, int event_len)
enum enum_duplicates handle_dup = DUP_IGNORE; enum enum_duplicates handle_dup = DUP_IGNORE;
if(lev->sql_ex.opt_flags && REPLACE_FLAG) if(lev->sql_ex.opt_flags && REPLACE_FLAG)
handle_dup = DUP_REPLACE; handle_dup = DUP_REPLACE;
sql_exchange ex((char*)lev->fname, lev->sql_ex.opt_flags && DUMPFILE_FLAG ); sql_exchange ex((char*)lev->fname, lev->sql_ex.opt_flags &&
DUMPFILE_FLAG );
String field_term(&lev->sql_ex.field_term, 1), String field_term(&lev->sql_ex.field_term, 1),
enclosed(&lev->sql_ex.enclosed, 1), line_term(&lev->sql_ex.line_term,1), enclosed(&lev->sql_ex.enclosed, 1), line_term(&lev->sql_ex.line_term,1),
escaped(&lev->sql_ex.escaped, 1), line_start(&lev->sql_ex.line_start, 1); escaped(&lev->sql_ex.escaped, 1), line_start(&lev->sql_ex.line_start, 1);
...@@ -927,7 +928,8 @@ pthread_handler_decl(handle_slave,arg __attribute__((unused))) ...@@ -927,7 +928,8 @@ pthread_handler_decl(handle_slave,arg __attribute__((unused)))
{ {
sql_print_error("Error running query, slave aborted. Fix the problem, and re-start\ sql_print_error("Error running query, slave aborted. Fix the problem, and re-start\
the slave thread with mysqladmin start-slave"); the slave thread with mysqladmin start-slave");
goto err; // there was an error running the query goto err;
// there was an error running the query
// abort the slave thread, when the problem is fixed, the user // abort the slave thread, when the problem is fixed, the user
// should restart the slave with mysqladmin start-slave // should restart the slave with mysqladmin start-slave
} }
......
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