diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2011-11-27 17:46:20 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2011-11-27 17:46:20 +0100 |
| commit | effed09bd7d8081704eaa017060da84c32e3bf29 (patch) | |
| tree | 9dd712312526cdbac1ab622efcdfc28e3fce965a /sql/sql_priv.h | |
| parent | 7189f09aa6d434fc889cb6d819e97c09f8cc0bcf (diff) | |
| parent | 12e60c4989ce0214da88faad7c08d2f046885327 (diff) | |
| download | mariadb-git-effed09bd7d8081704eaa017060da84c32e3bf29.tar.gz | |
5.3->5.5 merge
Diffstat (limited to 'sql/sql_priv.h')
| -rw-r--r-- | sql/sql_priv.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/sql/sql_priv.h b/sql/sql_priv.h index 30c72d603f4..412686a49c9 100644 --- a/sql/sql_priv.h +++ b/sql/sql_priv.h @@ -192,17 +192,14 @@ #define OPTIMIZER_SWITCH_TABLE_ELIMINATION (1ULL << 26) #define OPTIMIZER_SWITCH_LAST (1ULL << 26) -/* -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_INDEX_COND_PUSHDOWN | \ OPTIMIZER_SWITCH_TABLE_ELIMINATION | \ OPTIMIZER_SWITCH_IN_TO_EXISTS | \ + OPTIMIZER_SWITCH_MATERIALIZATION | \ OPTIMIZER_SWITCH_PARTIAL_MATCH_ROWID_MERGE|\ OPTIMIZER_SWITCH_PARTIAL_MATCH_TABLE_SCAN|\ OPTIMIZER_SWITCH_JOIN_CACHE_INCREMENTAL | \ |