diff options
| author | msvensson@shellback.(none) <> | 2006-10-26 19:11:09 +0200 |
|---|---|---|
| committer | msvensson@shellback.(none) <> | 2006-10-26 19:11:09 +0200 |
| commit | 631c82d2eaab60787da8f8e23df0ab190396a68c (patch) | |
| tree | 8fc087e7abffcb85edf4f2013db15bc96241b503 /sql/lex.h | |
| parent | 8f75d0913b93381dbf1298218fdea412521f33d6 (diff) | |
| download | mariadb-git-631c82d2eaab60787da8f8e23df0ab190396a68c.tar.gz | |
Bug#18888 Trying to overwrite sql/lex_hash.h during build
- As a sideeffect of the patch to generate lex_hash.h only once
on the machine where the source dist was produced, a problem
was found when compiling a mysqld without partition support - it
would crash when looking up the lex symbols due to mismatch between
lex.h and the generated lex_hash.h
- Remove the ifdef for partition in lex.h
- Fix minor problem with"EXPLAIN PARTITION" when not compiled with
partition(existed also without the above patch)
- Add test case that will be run when we don't have partition
support compiled into mysqld
- Return error ER_FEATURE_DISABLED if user tries to use PARTITION
when there is no support for it.
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 f19c9413e0e..711becc123f 100644 --- a/sql/lex.h +++ b/sql/lex.h @@ -45,6 +45,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[] = { @@ -383,11 +387,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)}, |