After merge fix mysql-test/r/func_time.result: After merge fix sql/table.cc: After merge fix
Attach a file by drag & drop or click to upload
