diff options
| author | unknown <sergefp@mysql.com> | 2005-08-07 21:30:46 +0000 |
|---|---|---|
| committer | unknown <sergefp@mysql.com> | 2005-08-07 21:30:46 +0000 |
| commit | f34d542c68068c2912888e967a2d55a2df9a1f0f (patch) | |
| tree | dbcbb5a0eddba715a96d562797fc5f8adb73fe61 /sql/sql_union.cc | |
| parent | d7086c4a0cc5d6240b1a0ad2b4eb83a935fadd1e (diff) | |
| parent | b9e04cf1efa45a717832cd2500502edb4c318858 (diff) | |
| download | mariadb-git-f34d542c68068c2912888e967a2d55a2df9a1f0f.tar.gz | |
Manual merge
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
Diffstat (limited to 'sql/sql_union.cc')
| -rw-r--r-- | sql/sql_union.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sql/sql_union.cc b/sql/sql_union.cc index ed77de87fe4..b394e92e742 100644 --- a/sql/sql_union.cc +++ b/sql/sql_union.cc @@ -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; |