-
unknown authored
into mysql.com:/home/ram/work/b23616/b23616.5.1 mysql-test/r/func_time.result: Auto merged mysql-test/t/func_time.test: Auto merged sql-common/my_time.c: Auto merged
a236d418
into mysql.com:/home/ram/work/b23616/b23616.5.1 mysql-test/r/func_time.result: Auto merged mysql-test/t/func_time.test: Auto merged sql-common/my_time.c: Auto merged