diff options
| author | monty@mashka.mysql.fi <> | 2002-12-06 21:11:27 +0200 |
|---|---|---|
| committer | monty@mashka.mysql.fi <> | 2002-12-06 21:11:27 +0200 |
| commit | 35ff08c2af7c6fd61d28e7da35ee5c3b6d26c06d (patch) | |
| tree | 969377c9c94475e559670dfcc0a8c4f7ed16b388 /sql/sql_union.cc | |
| parent | 859b68847666823baa328c5c7f3da96787807bb3 (diff) | |
| download | mariadb-git-35ff08c2af7c6fd61d28e7da35ee5c3b6d26c06d.tar.gz | |
After merge fixes
Added THD to add_to_xxx_list() functions for faster parsing.
Diffstat (limited to 'sql/sql_union.cc')
| -rw-r--r-- | sql/sql_union.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sql/sql_union.cc b/sql/sql_union.cc index 705152ee9f2..6e8c2ebdb5c 100644 --- a/sql/sql_union.cc +++ b/sql/sql_union.cc @@ -81,7 +81,8 @@ bool select_union::send_data(List<Item> &values) if (thd->net.last_errno == ER_RECORD_FILE_FULL) { thd->clear_error(); // do not report user about table overflow - if (create_myisam_from_heap(table, tmp_table_param, info.last_errno, 0)) + if (create_myisam_from_heap(thd, table, tmp_table_param, + info.last_errno, 0)) return 1; } else @@ -150,10 +151,9 @@ int st_select_lex_unit::prepare(THD *thd, select_result *result) tmp_table_param.field_count=item_list.elements; if (!(table= create_tmp_table(thd, &tmp_table_param, item_list, (ORDER*) 0, !union_option, - 1, 0, - (first_select()->options | thd->options | - TMP_TABLE_ALL_COLUMNS), - this))) + 1, (first_select()->options | thd->options | + TMP_TABLE_ALL_COLUMNS), + HA_POS_ERROR))) goto err; table->file->extra(HA_EXTRA_WRITE_CACHE); table->file->extra(HA_EXTRA_IGNORE_DUP_KEY); |