-
unknown authored
into outpost.site:/home/cps/mysql/trees/4.1-runtime-bug9191 mysql-test/r/func_time.result: Auto merged mysql-test/t/func_time.test: Auto merged sql/item_timefunc.cc: Auto merged sql/mysql_priv.h: Auto merged
ccb666c2
into outpost.site:/home/cps/mysql/trees/4.1-runtime-bug9191 mysql-test/r/func_time.result: Auto merged mysql-test/t/func_time.test: Auto merged sql/item_timefunc.cc: Auto merged sql/mysql_priv.h: Auto merged