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

---
 sql/item_strfunc.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'sql/item_strfunc.cc')

diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc
index 1a561c9eb34..01958f81deb 100644
--- a/sql/item_strfunc.cc
+++ b/sql/item_strfunc.cc
@@ -2059,7 +2059,7 @@ bool Item_func_conv_charset::fix_fields(THD *thd,struct st_table_list *tables, I
   
   if (thd && check_stack_overrun(thd,buff))
     return 0;					// Fatal error if flag is set!
-  if (args[0]->fix_fields(thd, tables, args))
+  if (args[0]->check_cols(1) || args[0]->fix_fields(thd, tables, args))
     return 1;
   maybe_null=args[0]->maybe_null;
   const_item_cache=args[0]->const_item();
@@ -2091,7 +2091,7 @@ bool Item_func_set_collation::fix_fields(THD *thd,struct st_table_list *tables,
   
   if (thd && check_stack_overrun(thd,buff))
     return 0;					// Fatal error if flag is set!
-  if (args[0]->fix_fields(thd, tables, args))
+  if (args[0]->check_cols(1) || args[0]->fix_fields(thd, tables, args))
     return 1;
   maybe_null=args[0]->maybe_null;
   set_charset(set_collation);
-- 
cgit v1.2.1