diff options
| author | cmiller@zippy.cornsilk.net <> | 2007-05-02 14:13:33 -0400 |
|---|---|---|
| committer | cmiller@zippy.cornsilk.net <> | 2007-05-02 14:13:33 -0400 |
| commit | 587290cf00e787992e08282b416b4a74eb675556 (patch) | |
| tree | a3f368b5c0fe064f88744b2233b685ef3bb63d8a /sql/lex.h | |
| parent | 71a0ecee6e2241f6f1fcf8216b37067b5ac0161b (diff) | |
| download | mariadb-git-587290cf00e787992e08282b416b4a74eb675556.tar.gz | |
Fix up merge. Some macros are now functions. Some functions are
renamed. Some new THD proc_info states are new. Directories must be
encountered in make in a specific order, to have symlinks already set.
Move community-server-specific tests into own tests, so that we can
exempt them from testing on enterprise servers.
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 81ae014b069..0b601de772a 100644 --- a/sql/lex.h +++ b/sql/lex.h @@ -387,6 +387,7 @@ static SYMBOL symbols[] = { { "PACK_KEYS", SYM(PACK_KEYS_SYM)}, { "PARSER", SYM(PARSER_SYM)}, { "PARTIAL", SYM(PARTIAL)}, + { "PAGE", SYM(PAGE_SYM)}, { "PARTITION", SYM(PARTITION_SYM)}, { "PARTITIONING", SYM(PARTITIONING_SYM)}, { "PARTITIONS", SYM(PARTITIONS_SYM)}, |