Commit 43aceea0 authored by guilhem@mysql.com's avatar guilhem@mysql.com

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

into mysql.com:/home/mysql_src/mysql-4.1
parents 950e45de 5ea3000d
...@@ -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