From 3f742831211a4d53d97c5ac6ee402b4782de8776 Mon Sep 17 00:00:00 2001
From: unknown <bell@sanja.is.com.ua>
Date: Fri, 15 Nov 2002 20:32:09 +0200
Subject: basic row Items (SCRUM)

include/mysql_com.h:
  basic row Items
include/mysqld_error.h:
  more wide error mening
libmysqld/Makefile.am:
  basic row Items
mysql-test/r/subselect.result:
  more wide error mening
sql/Makefile.am:
  basic row Items
sql/filesort.cc:
  basic row Items
sql/item.cc:
  basic row Items
sql/item.h:
  basic row Items
sql/item_cmpfunc.cc:
  basic row Items
sql/item_cmpfunc.h:
  basic row Items
sql/item_func.cc:
  basic row Items
sql/item_func.h:
  basic row Items
sql/item_strfunc.cc:
  basic row Items
sql/item_strfunc.h:
  basic row Items
sql/item_subselect.cc:
  basic row Items
sql/item_sum.cc:
  basic row Items
sql/share/czech/errmsg.txt:
  more wide error mening
sql/share/danish/errmsg.txt:
  more wide error mening
sql/share/dutch/errmsg.txt:
  more wide error mening
sql/share/english/errmsg.txt:
  more wide error mening
sql/share/estonian/errmsg.txt:
  more wide error mening
sql/share/french/errmsg.txt:
  more wide error mening
sql/share/german/errmsg.txt:
  more wide error mening
sql/share/greek/errmsg.txt:
  more wide error mening
sql/share/hungarian/errmsg.txt:
  more wide error mening
sql/share/italian/errmsg.txt:
  more wide error mening
sql/share/japanese/errmsg.txt:
  more wide error mening
sql/share/korean/errmsg.txt:
  more wide error mening
sql/share/norwegian-ny/errmsg.txt:
  more wide error mening
sql/share/norwegian/errmsg.txt:
  more wide error mening
sql/share/polish/errmsg.txt:
  more wide error mening
sql/share/portuguese/errmsg.txt:
  more wide error mening
sql/share/romanian/errmsg.txt:
  more wide error mening
sql/share/russian/errmsg.txt:
  more wide error mening
sql/share/serbian/errmsg.txt:
  more wide error mening
sql/share/slovak/errmsg.txt:
  more wide error mening
sql/share/spanish/errmsg.txt:
  more wide error mening
sql/share/swedish/errmsg.txt:
  more wide error mening
sql/share/ukrainian/errmsg.txt:
  more wide error mening
sql/sql_base.cc:
  fix_fields error handling
sql/sql_lex.cc:
  basic row Items
sql/sql_select.cc:
  basic row Items
sql/sql_yacc.yy:
  basic row Items
---
 sql/item_strfunc.h | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'sql/item_strfunc.h')

diff --git a/sql/item_strfunc.h b/sql/item_strfunc.h
index 2b308630b48..60462621630 100644
--- a/sql/item_strfunc.h
+++ b/sql/item_strfunc.h
@@ -101,8 +101,9 @@ public:
   void update_used_tables();
   bool fix_fields(THD *thd, TABLE_LIST *tlist, Item **ref)
   {
-    return (separator->fix_fields(thd, tlist, &separator)
-	    || Item_func::fix_fields(thd, tlist, ref));
+    return (separator->check_cols(1) ||
+	    separator->fix_fields(thd, tlist, &separator) ||
+	    Item_func::fix_fields(thd, tlist, ref));
   }
  const char *func_name() const { return "concat_ws"; }
  bool check_loop(uint id)
@@ -362,7 +363,8 @@ public:
   String *val_str(String *str);
   bool fix_fields(THD *thd, TABLE_LIST *tlist, Item **ref)
   {
-    return (item->fix_fields(thd, tlist, &item) ||
+    return (item->check_cols(1) ||
+	    item->fix_fields(thd, tlist, &item) ||
 	    Item_func::fix_fields(thd, tlist, ref));
   }
   void fix_length_and_dec();
@@ -389,7 +391,8 @@ public:
   String *val_str(String *str);
   bool fix_fields(THD *thd, TABLE_LIST *tlist, Item **ref)
   {
-    return (item->fix_fields(thd, tlist, &item) ||
+    return (item->check_cols(1) ||
+	    item->fix_fields(thd, tlist, &item) ||
 	    Item_func::fix_fields(thd, tlist, ref));
   }
   void fix_length_and_dec();
-- 
cgit v1.2.1