item_strfunc.cc:

The result didn't return proper collation

item_strfunc.cc:
The result didn't return proper collation
9755e44f · bar@bar.mysql.r18.ru · d37ebc34 · 9755e44f
Commit 9755e44f authored Mar 24, 2003 by bar@bar.mysql.r18.ru
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

sql/item_strfunc.cc sql/item_strfunc.cc +4 -1

No files found.
--- a/sql/item_strfunc.cc
+++ b/sql/item_strfunc.cc
@@ -1663,13 +1663,16 @@ longlong Item_func_elt::val_int()
 String *Item_func_elt::val_str(String *str)
 {
  uint tmp;
+  String *res;
  if ((tmp=(uint) item->val_int()) == 0 || tmp > arg_count)
  {
    null_value=1;
    return NULL;
  }
  null_value=0;
-  return args[tmp-1]->val_str(str);
+  res= args[tmp-1]->val_str(str);
+  res->set_charset(charset());
+  return res;
 }