diff options
author | unknown <sasha@mysql.sashanet.com> | 2000-10-21 12:33:36 -0600 |
---|---|---|
committer | unknown <sasha@mysql.sashanet.com> | 2000-10-21 12:33:36 -0600 |
commit | 57a7162f71f640abcf4318bc4a36fa7b56760182 (patch) | |
tree | b0c7465f204236436b53f5e88ec5d3063c662c36 /sql/slave.cc | |
parent | bc7aaafc7eb1af4ce5e7b5811dfa892082493483 (diff) | |
download | mariadb-git-57a7162f71f640abcf4318bc4a36fa7b56760182.tar.gz |
sql/slave.cc
cosmetic change
sql/slave.cc@1.49
cosmetic change
sql/slave.cc:
cosmetic change
Diffstat (limited to 'sql/slave.cc')
-rw-r--r-- | sql/slave.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sql/slave.cc b/sql/slave.cc index bfbe12df22e..676c80bb04a 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -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; if(lev->sql_ex.opt_flags && REPLACE_FLAG) 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), 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); @@ -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\ 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 // should restart the slave with mysqladmin start-slave } |