-
unknown authored
into mysql.com:/usr/home/ram/work/4.1.b16546 sql/item_timefunc.cc: Auto merged mysql-test/r/func_time.result: merging mysql-test/t/func_time.test: merging
f1b1c0eb
into mysql.com:/usr/home/ram/work/4.1.b16546 sql/item_timefunc.cc: Auto merged mysql-test/r/func_time.result: merging mysql-test/t/func_time.test: merging