summaryrefslogtreecommitdiff
path: root/sql/item_func.cc
diff options
context:
space:
mode:
authorunknown <monty@hundin.mysql.fi>2002-06-27 11:27:04 +0300
committerunknown <monty@hundin.mysql.fi>2002-06-27 11:27:04 +0300
commit835a75c97bbc31e35e25171db9c046ec1dae5b87 (patch)
tree857f8b9d553911f4937bee644ea5d2c3606e8e58 /sql/item_func.cc
parentd471ad0c236d2d2ff23e75dc02e3095e5edb7f17 (diff)
downloadmariadb-git-835a75c97bbc31e35e25171db9c046ec1dae5b87.tar.gz
Removed mysql_ssl_clear()
Added statistics information for alarms (for bug tracking) Don't store "incomplete" in the xxx.cfg file if we are not using --restart. (Crash-me) Enlarged STACK_BUF_ALLOC becasue of failed crash-me test Aded new script mysql_tableinfo to make a system directory. Docs/manual.texi: Changelog and TODO include/mysql.h: Removed mysql_ssl_clear() (One should use mysql_close() instead) include/thr_alarm.h: Added info for alarms libmysql/libmysql.c: Made mysql_ssl_clear() static libmysql/libmysql.def: cleanup libmysqld/libmysqld.def: cleanup myisam/myisamchk.c: describe -> description myisam/myisampack.c: Fixed copyright. mysys/thr_alarm.c: Added statistics information for alarms (for bug tracking) scripts/Makefile.am: Added mysql_table_info sql-bench/crash-me.sh: Don't store "incomplete" in the xxx.cfg file if we are not using --restart. This was done becasue "incomplete" made it harder to quickly repeat a test that failed. sql-bench/limits/mysql.cfg: Update to 1.58 sql/hostname.cc: Remved compiler warning sql/item_func.cc: cleanup sql/item_func.h: Cleanup sql/mysql_priv.h: Enlarged STACK_BUF_ALLOC becasue of failed crash-me test sql/opt_range.cc: Removed purify warning sql/sql_parse.cc: cleanup sql/sql_test.cc: Added ala
Diffstat (limited to 'sql/item_func.cc')
-rw-r--r--sql/item_func.cc6
1 files changed, 4 insertions, 2 deletions
diff --git a/sql/item_func.cc b/sql/item_func.cc
index accc5219a71..2d800cddb0d 100644
--- a/sql/item_func.cc
+++ b/sql/item_func.cc
@@ -2047,13 +2047,14 @@ err:
return 0;
}
+
void Item_func_match::init_search(bool no_order)
{
if (ft_handler)
return;
if (key == NO_SUCH_KEY)
- concat=new Item_func_concat_ws (new Item_string(" ",1), fields);
+ concat= new Item_func_concat_ws(new Item_string(" ",1), fields);
if (master)
{
@@ -2071,7 +2072,7 @@ void Item_func_match::init_search(bool no_order)
// MATCH ... AGAINST (NULL) is meaningless, but possible
if (!(ft_tmp=key_item()->val_str(&tmp2)))
{
- ft_tmp=&tmp2;
+ ft_tmp= &tmp2;
tmp2.set("",0);
}
@@ -2087,6 +2088,7 @@ void Item_func_match::init_search(bool no_order)
}
}
+
bool Item_func_match::fix_fields(THD *thd,struct st_table_list *tlist)
{
List_iterator<Item> li(fields);