Commit b2898b92 authored by unknown's avatar unknown

Merge

sql/item_strfunc.cc:
  Auto merged
mysql-test/r/user_var.result:
  SCCS merged
mysql-test/r/func_str.result:
  merge
parents fd04e8b6 b25fcad4
Branches unavailable
Tags unavailable
No related merge requests found
......@@ -1906,6 +1906,7 @@ b1: str->append((char)(num>>8));
#endif
str->append((char)num);
}
str->set_charset(collation.collation);
str->realloc(str->length()); // Add end 0 (for Purify)
return str;
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment