-
unknown authored
into zippy.cornsilk.net:/home/cmiller/work/mysql/bug10963/my51-bug10963 mysql-test/r/func_str.result: Auto merged mysql-test/t/func_str.test: Auto merged sql/item_func.cc: Auto merged sql/item_strfunc.cc: Auto merged
d75c784e
into zippy.cornsilk.net:/home/cmiller/work/mysql/bug10963/my51-bug10963 mysql-test/r/func_str.result: Auto merged mysql-test/t/func_str.test: Auto merged sql/item_func.cc: Auto merged sql/item_strfunc.cc: Auto merged