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

5ea3000d · guilhem@gbichot2.local · 887fd04f · 5ea3000d
Commit 5ea3000d authored Jan 26, 2004 by guilhem@gbichot2.local
Show whitespace changes
Inline Side-by-side

Showing with 5 additions and 2 deletions

sql/sql_yacc.yy sql/sql_yacc.yy +5 -2

No files found.
--- a/sql/sql_yacc.yy
+++ b/sql/sql_yacc.yy
@@ -1823,7 +1823,6 @@ opt_to:
 /*
  SLAVE START and SLAVE STOP are deprecated. We keep them for compatibility.
-  To use UNTIL, one must use START SLAVE, not SLAVE START.
 */
 slave:
@@ -1848,7 +1847,11 @@ slave:
 	   LEX *lex=Lex;
           lex->sql_command = SQLCOM_SLAVE_START;
 	   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
         {
 	   LEX *lex=Lex;