summaryrefslogtreecommitdiff
path: root/sql/item_func.cc
diff options
context:
space:
mode:
authorunknown <monty@mysql.com>2004-03-25 22:18:31 +0200
committerunknown <monty@mysql.com>2004-03-25 22:18:31 +0200
commitf6e33d67e1132a18e7a6ab49c2b6ff00da5112c8 (patch)
treee57ae2c11af5b2babaed4ac2ee1bc7352fdace68 /sql/item_func.cc
parentd31bb74adeddabad3d708faf4cc264493a623416 (diff)
parent054d2de499625fac668cff166af605a8106b8eaf (diff)
downloadmariadb-git-f6e33d67e1132a18e7a6ab49c2b6ff00da5112c8.tar.gz
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1 sql/item_func.cc: Auto merged sql/sql_base.cc: Auto merged sql/sql_union.cc: Auto merged
Diffstat (limited to 'sql/item_func.cc')
-rw-r--r--sql/item_func.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/item_func.cc b/sql/item_func.cc
index 9f80686e72c..fdc0ee9d6a0 100644
--- a/sql/item_func.cc
+++ b/sql/item_func.cc
@@ -2792,8 +2792,8 @@ void Item_func_match::init_search(bool no_order)
/*
Above function used only to get value and do not need fix_fields for it:
Item_string - basic constant
- fields - fix_fieds already was called for this arguments
- Item_func_concat_ws - do not need fix_fields to produce value
+ fields - fix_fields() was already called for this arguments
+ Item_func_concat_ws - do not need fix_fields() to produce value
*/
concat->quick_fix_field();
}