-
unknown authored
into salvation.intern.azundris.com:/home/tnurnberg/work/mysql-5.0-maint-20987 sql/item_timefunc.cc: Auto merged mysql-test/r/func_time.result: manual merge mysql-test/t/func_time.test: manual merge
4f630bf3
into salvation.intern.azundris.com:/home/tnurnberg/work/mysql-5.0-maint-20987 sql/item_timefunc.cc: Auto merged mysql-test/r/func_time.result: manual merge mysql-test/t/func_time.test: manual merge