diff options
| author | Sergey Petrunya <psergey@askmonty.org> | 2011-07-08 19:09:30 +0400 |
|---|---|---|
| committer | Sergey Petrunya <psergey@askmonty.org> | 2011-07-08 19:09:30 +0400 |
| commit | 41c766f30deb2bb2d46a7219e72257b614f243e4 (patch) | |
| tree | 77fa96e676fa91843fa92edec82c9991da2dc492 /sql/mysql_priv.h | |
| parent | 2d325b3cc2e567306402d84d4a5ec9f88a744f0d (diff) | |
| download | mariadb-git-41c766f30deb2bb2d46a7219e72257b614f243e4.tar.gz | |
Make table_elimination=on|off flag to be always present in @@optimizer_switch.
Diffstat (limited to 'sql/mysql_priv.h')
| -rw-r--r-- | sql/mysql_priv.h | 28 |
1 files changed, 3 insertions, 25 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index 249ee0e66a4..0d6cb60b842 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -591,37 +591,16 @@ protected: #define OPTIMIZER_SWITCH_JOIN_CACHE_HASHED (1ULL << 22) #define OPTIMIZER_SWITCH_JOIN_CACHE_BKA (1ULL << 23) #define OPTIMIZER_SWITCH_OPTIMIZE_JOIN_BUFFER_SIZE (1ULL << 24) -#ifdef DBUG_OFF -# define OPTIMIZER_SWITCH_LAST (1ULL << 25) -#else -# define OPTIMIZER_SWITCH_TABLE_ELIMINATION (1ULL << 25) -# define OPTIMIZER_SWITCH_LAST (1ULL << 26) -#endif +#define OPTIMIZER_SWITCH_TABLE_ELIMINATION (1ULL << 25) +#define OPTIMIZER_SWITCH_LAST (1ULL << 26) -#ifdef DBUG_OFF /* The following must be kept in sync with optimizer_switch_str in mysqld.cc */ /* TODO: Materialization is off by default to mimic 5.1/5.2 behavior. Once cost based choice between materialization and in-to-exists should be enabled by default, add OPTIMIZER_SWITCH_MATERIALIZATION */ -# define OPTIMIZER_SWITCH_DEFAULT (OPTIMIZER_SWITCH_INDEX_MERGE | \ - OPTIMIZER_SWITCH_INDEX_MERGE_UNION | \ - OPTIMIZER_SWITCH_INDEX_MERGE_SORT_UNION | \ - OPTIMIZER_SWITCH_INDEX_MERGE_INTERSECT | \ - OPTIMIZER_SWITCH_DERIVED_MERGE | \ - OPTIMIZER_SWITCH_DERIVED_WITH_KEYS | \ - OPTIMIZER_SWITCH_IN_TO_EXISTS | \ - OPTIMIZER_SWITCH_PARTIAL_MATCH_ROWID_MERGE|\ - OPTIMIZER_SWITCH_PARTIAL_MATCH_TABLE_SCAN|\ - OPTIMIZER_SWITCH_SUBQUERY_CACHE|\ - OPTIMIZER_SWITCH_SUBQUERY_CACHE | \ - OPTIMIZER_SWITCH_JOIN_CACHE_INCREMENTAL | \ - OPTIMIZER_SWITCH_JOIN_CACHE_HASHED | \ - OPTIMIZER_SWITCH_JOIN_CACHE_BKA | \ - OPTIMIZER_SWITCH_OPTIMIZE_JOIN_BUFFER_SIZE) -#else -# define OPTIMIZER_SWITCH_DEFAULT (OPTIMIZER_SWITCH_INDEX_MERGE | \ +#define OPTIMIZER_SWITCH_DEFAULT (OPTIMIZER_SWITCH_INDEX_MERGE | \ OPTIMIZER_SWITCH_INDEX_MERGE_UNION | \ OPTIMIZER_SWITCH_INDEX_MERGE_SORT_UNION | \ OPTIMIZER_SWITCH_INDEX_MERGE_INTERSECT | \ @@ -636,7 +615,6 @@ enabled by default, add OPTIMIZER_SWITCH_MATERIALIZATION OPTIMIZER_SWITCH_JOIN_CACHE_HASHED | \ OPTIMIZER_SWITCH_JOIN_CACHE_BKA | \ OPTIMIZER_SWITCH_OPTIMIZE_JOIN_BUFFER_SIZE) -#endif /* Replication uses 8 bytes to store SQL_MODE in the binary log. The day you |