Commit 893f3d6d authored by unknown's avatar unknown

fix for BUG#2516: "SLAVE START may crash mysqld"


sql/sql_yacc.yy:
  Enable UNTIL in SLAVE START; bzero() fixes the bug.
parent a0f2c81b
...@@ -1823,7 +1823,6 @@ opt_to: ...@@ -1823,7 +1823,6 @@ opt_to:
/* /*
SLAVE START and SLAVE STOP are deprecated. We keep them for compatibility. 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:
...@@ -1848,7 +1847,11 @@ slave: ...@@ -1848,7 +1847,11 @@ slave:
LEX *lex=Lex; LEX *lex=Lex;
lex->sql_command = SQLCOM_SLAVE_START; lex->sql_command = SQLCOM_SLAVE_START;
lex->type = 0; lex->type = 0;
/* We'll use mi structure for UNTIL options */
bzero((char*) &lex->mi, sizeof(lex->mi));
} }
slave_until
{}
| SLAVE STOP_SYM slave_thread_opts | SLAVE STOP_SYM slave_thread_opts
{ {
LEX *lex=Lex; LEX *lex=Lex;
......
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