diff options
| author | unknown <dlenev@mysql.com> | 2003-09-14 01:57:09 +0400 |
|---|---|---|
| committer | unknown <dlenev@mysql.com> | 2003-09-14 01:57:09 +0400 |
| commit | 1f82a0de6c841fc2b58cd45caf3ebeafce47d861 (patch) | |
| tree | 9b95250006febf53e90b41329026267482bcd75e /sql/lex.h | |
| parent | df8b036d029a049ba40ba404142bbee3fd8cf13d (diff) | |
| parent | 2f8f0a7e4d4d86489fc208dba00f37c74e1a0293 (diff) | |
| download | mariadb-git-1f82a0de6c841fc2b58cd45caf3ebeafce47d861.tar.gz | |
Manual merge after commiting START SLAVE UNTIL
sql/lex.h:
Auto merged
sql/log.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/repl_failsafe.cc:
Auto merged
include/mysqld_error.h:
Manual merge
mysql-test/r/rpl000015.result:
Manual merge
mysql-test/r/rpl_empty_master_crash.result:
Manual merge
mysql-test/r/rpl_flush_log_loop.result:
Manual merge
mysql-test/r/rpl_log.result:
Manual merge
mysql-test/r/rpl_log_pos.result:
Manual merge
mysql-test/r/rpl_redirect.result:
Manual merge
mysql-test/r/rpl_replicate_do.result:
Manual merge
mysql-test/r/rpl_rotate_logs.result:
Manual merge
sql/share/czech/errmsg.txt:
Manual merge
sql/share/danish/errmsg.txt:
Manual merge
sql/share/dutch/errmsg.txt:
Manual merge
sql/share/english/errmsg.txt:
Manual merge
sql/share/estonian/errmsg.txt:
Manual merge
sql/share/french/errmsg.txt:
Manual merge
sql/share/german/errmsg.txt:
Manual merge
sql/share/greek/errmsg.txt:
Manual merge
sql/share/hungarian/errmsg.txt:
Manual merge
sql/share/italian/errmsg.txt:
Manual merge
sql/share/japanese/errmsg.txt:
Manual merge
sql/share/korean/errmsg.txt:
Manual merge
sql/share/norwegian-ny/errmsg.txt:
Manual merge
sql/share/norwegian/errmsg.txt:
Manual merge
sql/share/polish/errmsg.txt:
Manual merge
sql/share/portuguese/errmsg.txt:
Manual merge
sql/share/romanian/errmsg.txt:
Manual merge
sql/share/russian/errmsg.txt:
Manual merge
sql/share/serbian/errmsg.txt:
Manual merge
sql/share/slovak/errmsg.txt:
Manual merge
sql/share/spanish/errmsg.txt:
Manual merge
sql/share/swedish/errmsg.txt:
Manual merge
sql/share/ukrainian/errmsg.txt:
Manual merge
sql/slave.cc:
Manual merge
sql/slave.h:
Manual merge
sql/sql_repl.cc:
Manual merge
sql/sql_yacc.yy:
Manual merge
Diffstat (limited to 'sql/lex.h')
| -rw-r--r-- | sql/lex.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/lex.h b/sql/lex.h index aa6d96d4029..fb3c018de42 100644 --- a/sql/lex.h +++ b/sql/lex.h @@ -411,6 +411,7 @@ static SYMBOL symbols[] = { { "USE", SYM(USE_SYM),0,0}, { "USE_FRM", SYM(USE_FRM),0,0}, { "USER", SYM(USER),0,0}, + { "UNTIL", SYM(UNTIL_SYM),0,0}, { "USING", SYM(USING),0,0}, { "UTC_DATE", SYM(UTC_DATE_SYM),0,0}, { "UTC_TIME", SYM(UTC_TIME_SYM),0,0}, |