into  salvation.intern.azundris.com:/home/tnurnberg/21913/my51-21913


sql/sql_string.cc:
  Auto merged
mysql-test/r/func_time.result:
  manual merge
mysql-test/t/func_time.test:
  manual merge