1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

item_cmpfunc.cc:

Browse Source 
IFNULL() now honors collations


sql/item_cmpfunc.cc:
  IFNULL() now honors collations
This commit is contained in:
unknown 2003-03-21 19:02:07 +04:00
parent ce17ac5af2
commit 92f5103df4
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sql/item_cmpfunc.cc
View File

@ -650,6 +650,9 @@ Item_func_ifnull::fix_length_and_dec()
args[1]->result_type())) != args[1]->result_type())) !=
REAL_RESULT) REAL_RESULT)
decimals= 0; decimals= 0;
if (set_charset(args[0]->charset(),args[0]->coercibility,
args[1]->charset(),args[1]->coercibility))
my_error(ER_WRONG_ARGUMENTS,MYF(0),func_name());
} }
@ -690,11 +693,13 @@ Item_func_ifnull::val_str(String *str)
if (!args[0]->null_value) if (!args[0]->null_value)
{ {
null_value=0; null_value=0;
res->set_charset(charset());
return res; return res;
} }
res=args[1]->val_str(str); res=args[1]->val_str(str);
if ((null_value=args[1]->null_value)) if ((null_value=args[1]->null_value))
return 0; return 0;
res->set_charset(charset());
return res; return res;
} }