diff options
| author | unknown <monty@hundin.mysql.fi> | 2001-11-22 17:55:18 +0200 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2001-11-22 17:55:18 +0200 |
| commit | 38357b30e6ccf4278807cbd8b91ca14efe3fff15 (patch) | |
| tree | 5c88c46555c8f2f0d49c779e6347d2d6139a84e0 /sql/sql_union.cc | |
| parent | e673b6dcf8b55ec4457ab554a1c09ccf3c079463 (diff) | |
| download | mariadb-git-38357b30e6ccf4278807cbd8b91ca14efe3fff15.tar.gz | |
Fixed fulltext after merge from 3.23.45
First (incomplete) version of transaction and as3ap tests.
BitKeeper/etc/ignore:
Added sql-bench/test-transactions to the ignore list
mysql-test/r/fulltext.result:
Update fulltext results after merge
sql-bench/Makefile.am:
Added transaction test
sql-bench/run-all-tests.sh:
Added transaction test
sql-bench/server-cfg.sh:
Added transaction test
sql-bench/test-ATIS.sh:
Cleanup
sql/item_func.cc:
Fix bad merge
sql/mysqld.cc:
Cleanup
sql/sql_base.cc:
Fix bad merge
sql/sql_delete.cc:
Cleanup
sql/sql_parse.cc:
Fix bad merge
sql/sql_select.cc:
Fix bad merge
sql/sql_union.cc:
Fix bad merge
tools/mysqlmanager.c:
C
Diffstat (limited to 'sql/sql_union.cc')
| -rw-r--r-- | sql/sql_union.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sql/sql_union.cc b/sql/sql_union.cc index a6ea88d9adc..b2ffb97fa81 100644 --- a/sql/sql_union.cc +++ b/sql/sql_union.cc @@ -68,7 +68,6 @@ int mysql_union(THD *thd, LEX *lex,select_result *result) res=mysql_select(thd, (TABLE_LIST*) sl->table_list.first, sl->item_list, sl->where, - sl->ftfunc_list, (sl->braces) ? (ORDER *) sl->order_list.first : (ORDER *) 0, (ORDER*) sl->group_list.first, sl->having, @@ -127,7 +126,6 @@ int mysql_union(THD *thd, LEX *lex,select_result *result) res=mysql_select(thd, (TABLE_LIST*) sl->table_list.first, sl->item_list, sl->where, - sl->ftfunc_list, (sl->braces) ? (ORDER *)sl->order_list.first : (ORDER *) 0, (ORDER*) sl->group_list.first, sl->having, @@ -150,8 +148,12 @@ int mysql_union(THD *thd, LEX *lex,select_result *result) /* Create a list of fields in the temporary table */ List_iterator<Item> it(item_list); Field **field; +#if 0 List<Item_func_match> ftfunc_list; ftfunc_list.empty(); +#else + thd->lex.select_lex.ftfunc_list.empty(); +#endif for (field=table->field ; *field ; field++) { @@ -170,7 +172,7 @@ int mysql_union(THD *thd, LEX *lex,select_result *result) thd->options&= ~OPTION_FOUND_ROWS; } res=mysql_select(thd,&result_table_list, - item_list, NULL, ftfunc_list, order, + item_list, NULL, /*ftfunc_list,*/ order, (ORDER*) NULL, NULL, (ORDER*) NULL, thd->options, result); } |