diff options
| author | anozdrin/alik@alik. <> | 2006-11-07 16:24:35 +0300 |
|---|---|---|
| committer | anozdrin/alik@alik. <> | 2006-11-07 16:24:35 +0300 |
| commit | ee15c11b7c6e3663d78b12afd246154d5ee4c544 (patch) | |
| tree | 4c085423d9f65d9221f445b2bc03833ed5b266f0 /sql/lex.h | |
| parent | 103e0d5ec9a39c391bb73d1fed32891ad685acbc (diff) | |
| parent | a56565b8d551222bb610a7c3df2b4d3ebbf4459b (diff) | |
| download | mariadb-git-ee15c11b7c6e3663d78b12afd246154d5ee4c544.tar.gz | |
Merge alik.:/mnt/raid/alik/MySQL/devel/5.1
into alik.:/mnt/raid/alik/MySQL/devel/5.1-rt-merged-2
Diffstat (limited to 'sql/lex.h')
| -rw-r--r-- | sql/lex.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sql/lex.h b/sql/lex.h index 97b097148aa..254d7f10fb7 100644 --- a/sql/lex.h +++ b/sql/lex.h @@ -36,6 +36,10 @@ SYM_GROUP sym_group_rtree= {"RTree keys", "HAVE_RTREE_KEYS"}; Symbols are broken into separated arrays to allow field names with same name as functions. These are kept sorted for human lookup (the symbols are hashed). + + NOTE! The symbol tables should be the same regardless of what features + are compiled into the server. Don't add ifdef'ed symbols to the + lists */ static SYMBOL symbols[] = { @@ -374,11 +378,9 @@ static SYMBOL symbols[] = { { "PACK_KEYS", SYM(PACK_KEYS_SYM)}, { "PARSER", SYM(PARSER_SYM)}, { "PARTIAL", SYM(PARTIAL)}, -#ifdef WITH_PARTITION_STORAGE_ENGINE { "PARTITION", SYM(PARTITION_SYM)}, { "PARTITIONING", SYM(PARTITIONING_SYM)}, { "PARTITIONS", SYM(PARTITIONS_SYM)}, -#endif { "PASSWORD", SYM(PASSWORD)}, { "PHASE", SYM(PHASE_SYM)}, { "PLUGIN", SYM(PLUGIN_SYM)}, |