diff options
| author | Igor Babaev <igor@askmonty.org> | 2011-06-04 19:56:06 -0700 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2011-06-04 19:56:06 -0700 |
| commit | f03a3ee54fb8b5aeeba590677f48b54a57ab45cf (patch) | |
| tree | afb1235c5417019a563b1c1d64443f3b890d05df /sql/sql_expression_cache.cc | |
| parent | f0f2ec3086000a22e83ce9ca33d59a3347784e0c (diff) | |
| parent | 35c35858f859f23c23a414cdb21fdfe39d5de11c (diff) | |
| download | mariadb-git-f03a3ee54fb8b5aeeba590677f48b54a57ab45cf.tar.gz | |
Merged the code of mwl 106 into the latest 5.3 with mwl 90 pushed.
Resolved all conflicts and failures.
Diffstat (limited to 'sql/sql_expression_cache.cc')
| -rw-r--r-- | sql/sql_expression_cache.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_expression_cache.cc b/sql/sql_expression_cache.cc index db1f47c5603..c3450884610 100644 --- a/sql/sql_expression_cache.cc +++ b/sql/sql_expression_cache.cc @@ -109,7 +109,8 @@ void Expression_cache_tmptable::init() ~(OPTION_BIG_TABLES | TMP_TABLE_FORCE_MYISAM)), HA_POS_ERROR, - (char *)"subquery-cache-table"))) + (char *)"subquery-cache-table", + TRUE))) { DBUG_PRINT("error", ("create_tmp_table failed, caching switched off")); DBUG_VOID_RETURN; |