diff options
Diffstat (limited to 'sql/opt_subselect.cc')
| -rw-r--r-- | sql/opt_subselect.cc | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/sql/opt_subselect.cc b/sql/opt_subselect.cc index 1719b5a53d5..3b1991d1686 100644 --- a/sql/opt_subselect.cc +++ b/sql/opt_subselect.cc @@ -10,10 +10,11 @@ #pragma implementation // gcc: Class implementation #endif -#include "mysql_priv.h" +#include "sql_base.h" #include "sql_select.h" +#include "filesort.h" #include "opt_subselect.h" - +#include "sql_test.h" #include <my_bit.h> /* @@ -3172,7 +3173,7 @@ bool setup_sj_materialization_part1(JOIN_TAB *sjm_tab) sjm->sjm_table_cols, (ORDER*) 0, TRUE /* distinct */, 1, /*save_sum_fields*/ - thd->options | TMP_TABLE_ALL_COLUMNS, + thd->variables.option_bits | TMP_TABLE_ALL_COLUMNS, HA_POS_ERROR /*rows_limit */, (char*)"sj-materialize"))) DBUG_RETURN(TRUE); /* purecov: inspected */ @@ -3779,7 +3780,7 @@ SJ_TMP_TABLE::create_sj_weedout_tmp_table(THD *thd) recinfo++; if (share->db_type() == TMP_ENGINE_HTON) { - if (create_internal_tmp_table(table, keyinfo, start_recinfo, &recinfo, 0)) + if (create_internal_tmp_table(table, keyinfo, start_recinfo, &recinfo, 0, 0)) goto err; } if (open_tmp_table(table)) @@ -4648,7 +4649,7 @@ TABLE *create_dummy_tmp_table(THD *thd) sjm_table_cols, (ORDER*) 0, TRUE /* distinct */, 1, /*save_sum_fields*/ - thd->options | TMP_TABLE_ALL_COLUMNS, + thd->variables.option_bits | TMP_TABLE_ALL_COLUMNS, HA_POS_ERROR /*rows_limit */, (char*)"dummy", TRUE /* Do not open */))) { |