diff options
| author | Sergey Petrunya <psergey@askmonty.org> | 2009-08-24 22:10:48 +0300 |
|---|---|---|
| committer | Sergey Petrunya <psergey@askmonty.org> | 2009-08-24 22:10:48 +0300 |
| commit | d294aae6c8d085f2986bf7dbbb4e0cc30b061be5 (patch) | |
| tree | 800093c8df7c9ca9a0998f09465fa6076554749d /sql/mysql_priv.h | |
| parent | 21d25739088a125804db1c084b91078e8ea1c5b0 (diff) | |
| download | mariadb-git-d294aae6c8d085f2986bf7dbbb4e0cc30b061be5.tar.gz | |
MWL#17: Table elimination: last fixes
- Add an @@optimizer_switch flag for table_elimination for debug build
- Better comments
mysql-test/t/index_merge_myisam.test:
MWL#17: Table elimination: last fixes
- Add an @@optimizer_switch flag for table_elimination for debug build
sql/mysql_priv.h:
MWL#17: Table elimination: last fixes
- Add an @@optimizer_switch flag for table_elimination for debug build
sql/mysqld.cc:
MWL#17: Table elimination: last fixes
- Add an @@optimizer_switch flag for table_elimination for debug build
Diffstat (limited to 'sql/mysql_priv.h')
| -rw-r--r-- | sql/mysql_priv.h | 25 |
1 files changed, 19 insertions, 6 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index 816efe05c18..8151857b1f3 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -528,14 +528,27 @@ protected: #define OPTIMIZER_SWITCH_INDEX_MERGE_UNION 2 #define OPTIMIZER_SWITCH_INDEX_MERGE_SORT_UNION 4 #define OPTIMIZER_SWITCH_INDEX_MERGE_INTERSECT 8 -#define OPTIMIZER_SWITCH_LAST 16 -/* The following must be kept in sync with optimizer_switch_str in mysqld.cc */ -#define OPTIMIZER_SWITCH_DEFAULT (OPTIMIZER_SWITCH_INDEX_MERGE | \ - OPTIMIZER_SWITCH_INDEX_MERGE_UNION | \ - OPTIMIZER_SWITCH_INDEX_MERGE_SORT_UNION | \ - OPTIMIZER_SWITCH_INDEX_MERGE_INTERSECT) +#ifdef DBUG_OFF +# define OPTIMIZER_SWITCH_LAST 16 +#else +# define OPTIMIZER_SWITCH_TABLE_ELIMINATION 16 +# define OPTIMIZER_SWITCH_LAST 32 +#endif +#ifdef DBUG_OFF +/* The following must be kept in sync with optimizer_switch_str in mysqld.cc */ +# define OPTIMIZER_SWITCH_DEFAULT (OPTIMIZER_SWITCH_INDEX_MERGE | \ + OPTIMIZER_SWITCH_INDEX_MERGE_UNION | \ + OPTIMIZER_SWITCH_INDEX_MERGE_SORT_UNION | \ + OPTIMIZER_SWITCH_INDEX_MERGE_INTERSECT) +#else +# 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_TABLE_ELIMINATION) +#endif /* Replication uses 8 bytes to store SQL_MODE in the binary log. The day you |