-
unknown authored
into salvation.intern.azundris.com:/home/tnurnberg/work/mysql-5.1-maint-16456 mysql-test/r/func_time.result: Auto merged mysql-test/t/disabled.def: Auto merged sql/item_func.cc: Auto merged sql/sql_parse.cc: Auto merged
129c87bc
into salvation.intern.azundris.com:/home/tnurnberg/work/mysql-5.1-maint-16456 mysql-test/r/func_time.result: Auto merged mysql-test/t/disabled.def: Auto merged sql/item_func.cc: Auto merged sql/sql_parse.cc: Auto merged