-
unknown authored
into mysql.com:/home/hf/work/27957/my51-27957 mysql-test/r/cast.result: Auto merged sql/item_func.cc: Auto merged sql/item_func.h: Auto merged sql/my_decimal.h: merging
5f41b262
into mysql.com:/home/hf/work/27957/my51-27957 mysql-test/r/cast.result: Auto merged sql/item_func.cc: Auto merged sql/item_func.h: Auto merged sql/my_decimal.h: merging