diff options
| author | unknown <gluh@gluh.mysql.r18.ru> | 2003-03-11 16:32:17 +0400 |
|---|---|---|
| committer | unknown <gluh@gluh.mysql.r18.ru> | 2003-03-11 16:32:17 +0400 |
| commit | 4901295af1d1e5fa30225eae5c21862f9d00be42 (patch) | |
| tree | 1a27ba4c4a93d54b53e2469bc0f8e600f74e91cb /sql/lex.h | |
| parent | bbc8f836c0400f361458bffd42d71ea2177a9e18 (diff) | |
| parent | 92457d6e45dff4561c53bdd7feec1595585a65af (diff) | |
| download | mariadb-git-4901295af1d1e5fa30225eae5c21862f9d00be42.tar.gz | |
Conflicts relsolving
mysql-test/t/rpl_rotate_logs.test:
Auto merged
sql/lex.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_repl.cc:
Auto merged
sql/sql_repl.h:
Auto merged
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 c5dfae3921a..80f84628d27 100644 --- a/sql/lex.h +++ b/sql/lex.h @@ -64,6 +64,7 @@ static SYMBOL symbols[] = { { "AVG_ROW_LENGTH", SYM(AVG_ROW_LENGTH),0,0}, { "AUTO_INCREMENT", SYM(AUTO_INC),0,0}, { "BACKUP", SYM(BACKUP_SYM),0,0}, + { "BEFORE", SYM(BEFORE_SYM),0,0}, { "BEGIN", SYM(BEGIN_SYM),0,0}, { "BERKELEYDB", SYM(BERKELEY_DB_SYM),0,0}, { "BDB", SYM(BERKELEY_DB_SYM),0,0}, |