diff options
| author | Michael Widenius <monty@askmonty.org> | 2013-06-18 02:01:34 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2013-06-18 02:01:34 +0300 |
| commit | 2534521f9a7d66b48cb9ca9402e82a0c58b156d8 (patch) | |
| tree | 920207a20892d748bd6b04a6699f07a5f3f1fae5 /sql/lex.h | |
| parent | 0b7f8ed9738546f57d9159b52894e5abc99086fc (diff) | |
| download | mariadb-git-2534521f9a7d66b48cb9ca9402e82a0c58b156d8.tar.gz | |
Fixed some merge issues:
- temporary tables now works
- mysql-system_tables updated to not use temporary tables
- PASSWORD() function fixed
- Support for STATS_AUTO_RECALC, STATS_PERSISTENT and STATS_SAMPLE_PAGES table options
Diffstat (limited to 'sql/lex.h')
| -rw-r--r-- | sql/lex.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/lex.h b/sql/lex.h index 0f20df71576..06d6012b469 100644 --- a/sql/lex.h +++ b/sql/lex.h @@ -557,6 +557,9 @@ static SYMBOL symbols[] = { { "START", SYM(START_SYM)}, { "STARTING", SYM(STARTING)}, { "STARTS", SYM(STARTS_SYM)}, + { "STATS_AUTO_RECALC",SYM(STATS_AUTO_RECALC_SYM)}, + { "STATS_PERSISTENT", SYM(STATS_PERSISTENT_SYM)}, + { "STATS_SAMPLE_PAGES",SYM(STATS_SAMPLE_PAGES_SYM)}, { "STATUS", SYM(STATUS_SYM)}, { "STOP", SYM(STOP_SYM)}, { "STORAGE", SYM(STORAGE_SYM)}, |