database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

Manual merge

Browse Source 
BitKeeper/deleted/.del-not_windows.inc:
  Delete: mysql-test/include/not_windows.inc
mysql-test/r/fulltext_order_by.result:
  Auto merged
mysql-test/r/type_datetime.result:
  Auto merged
mysql-test/t/fulltext_order_by.test:
  Auto merged
mysql-test/t/query_cache.test:
  Auto merged
mysql-test/t/rpl_flush_tables.test:
  Auto merged
sql-common/my_time.c:
  Auto merged
sql/item_timefunc.h:
  Auto merged
sql/sql_union.cc:
  Auto merged
This commit is contained in:
unknown
2005-08-07 21:30:46 +00:00
parent d7086c4a0c b9e04cf1ef
commit f34d542c68
13 changed files with 73 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sql/sql_union.cc
View File

@@ -119,8 +119,6 @@ void
st_select_lex_unit::init_prepare_fake_select_lex(THD *thd)
{
thd->lex->current_select= fake_select_lex;
fake_select_lex->ftfunc_list_alloc.empty();
fake_select_lex->ftfunc_list= &fake_select_lex->ftfunc_list_alloc;
fake_select_lex->table_list.link_in_list((byte *)&result_table_list,
(byte **)
&result_table_list.next_local);
@@ -301,7 +299,8 @@ bool st_select_lex_unit::prepare(THD *thd_arg, select_result *sel_result,
/*
Force the temporary table to be a MyISAM table if we're going to use
fullext functions (MATCH ... AGAINST .. IN BOOLEAN MODE) when reading
from it.
from it (this should be removed in 5.2 when fulltext search is moved
out of MyISAM).
*/
if (global_parameters->ftfunc_list->elements)
create_options= create_options | TMP_TABLE_FORCE_MYISAM;