Commit cc17035d authored by unknown's avatar unknown

Accept SLAVE START and STOP, even if deprecated.


sql/log_event.cc:
  undoing a wrong change (the case is handled in Rotate_log_event::exec_event)
parent 7385c498
...@@ -1084,12 +1084,6 @@ int Start_log_event::exec_event(struct st_relay_log_info* rli) ...@@ -1084,12 +1084,6 @@ int Start_log_event::exec_event(struct st_relay_log_info* rli)
This is 4.x, so a Start_log_event is only at master startup, This is 4.x, so a Start_log_event is only at master startup,
so we are sure the master has restarted and cleared his temp tables. so we are sure the master has restarted and cleared his temp tables.
*/ */
/*
If the master died before writing the COMMIT to the binlog, rollback;
otherwise it does not hurt to rollback.
*/
ha_rollback(thd);
close_temporary_tables(thd); close_temporary_tables(thd);
cleanup_load_tmpdir(); cleanup_load_tmpdir();
break; break;
......
...@@ -1751,7 +1751,8 @@ opt_to: ...@@ -1751,7 +1751,8 @@ opt_to:
| AS {}; | AS {};
/* /*
The first two deprecate the last two--delete the last two for 4.1 release SLAVE START and SLAVE STOP are deprecated. We keep them for compatibility.
To use UNTIL, one must use START SLAVE, not SLAVE START.
*/ */
slave: slave:
...@@ -1771,7 +1772,20 @@ slave: ...@@ -1771,7 +1772,20 @@ slave:
lex->sql_command = SQLCOM_SLAVE_STOP; lex->sql_command = SQLCOM_SLAVE_STOP;
lex->type = 0; lex->type = 0;
} }
; | SLAVE START_SYM slave_thread_opts
{
LEX *lex=Lex;
lex->sql_command = SQLCOM_SLAVE_START;
lex->type = 0;
}
| SLAVE STOP_SYM slave_thread_opts
{
LEX *lex=Lex;
lex->sql_command = SQLCOM_SLAVE_STOP;
lex->type = 0;
}
;
start: start:
START_SYM TRANSACTION_SYM { Lex->sql_command = SQLCOM_BEGIN;} START_SYM TRANSACTION_SYM { Lex->sql_command = SQLCOM_BEGIN;}
......
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