diff options
| author | Sergey Petrunya <psergey@askmonty.org> | 2010-02-18 00:59:41 +0300 |
|---|---|---|
| committer | Sergey Petrunya <psergey@askmonty.org> | 2010-02-18 00:59:41 +0300 |
| commit | d63959eed35faffb2ef35606c35840a8d5115454 (patch) | |
| tree | 22271784bfa05236b68b1ce2187dd24f1dfac803 /sql/sql_union.cc | |
| parent | 663773aa8ca3fab6880bda06bebeeaf2d92edf7e (diff) | |
| download | mariadb-git-d63959eed35faffb2ef35606c35840a8d5115454.tar.gz | |
Subquery optimizations backport: fix test failures, update test results.
Diffstat (limited to 'sql/sql_union.cc')
| -rw-r--r-- | sql/sql_union.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sql/sql_union.cc b/sql/sql_union.cc index 3ac91fc6a20..14800f4aea6 100644 --- a/sql/sql_union.cc +++ b/sql/sql_union.cc @@ -103,6 +103,8 @@ bool select_union::flush() is_union_distinct if set, the temporary table will eliminate duplicates on insert options create options + table_alias name of the temporary table + bit_fields_as_long convert bit fields to ulonglong DESCRIPTION Create a temporary table that is used to store the result of a UNION, @@ -116,11 +118,13 @@ bool select_union::flush() bool select_union::create_result_table(THD *thd_arg, List<Item> *column_types, bool is_union_distinct, ulonglong options, - const char *alias) + const char *alias, + bool bit_fields_as_long) { DBUG_ASSERT(table == 0); tmp_table_param.init(); tmp_table_param.field_count= column_types->elements; + tmp_table_param.bit_fields_as_long= bit_fields_as_long; if (! (table= create_tmp_table(thd_arg, &tmp_table_param, *column_types, (ORDER*) 0, is_union_distinct, 1, @@ -350,7 +354,7 @@ bool st_select_lex_unit::prepare(THD *thd_arg, select_result *sel_result, create_options= create_options | TMP_TABLE_FORCE_MYISAM; if (union_result->create_result_table(thd, &types, test(union_distinct), - create_options, "")) + create_options, "", FALSE)) goto err; bzero((char*) &result_table_list, sizeof(result_table_list)); result_table_list.db= (char*) ""; |