Merge gbichot@213.136.52.20:/home/bk/mysql-4.1

into mysql.com:/home/mysql_src/mysql-4.1
This commit is contained in:
guilhem@mysql.com 2004-01-26 19:39:46 +01:00
commit 43aceea0bb

View File

@ -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:
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;