-
unknown authored
into mysql.com:/home/ram/work/b32559/b32559.5.1 mysql-test/r/func_misc.result: Auto merged sql/item.cc: Auto merged sql/item.h: Auto merged mysql-test/t/func_misc.test: manual merge.
c4c6d3d8
into mysql.com:/home/ram/work/b32559/b32559.5.1 mysql-test/r/func_misc.result: Auto merged sql/item.cc: Auto merged sql/item.h: Auto merged mysql-test/t/func_misc.test: manual merge.