• unknown's avatar
    table.cc, func_time.result: · 81f99b95
    unknown authored
      After merge fix
    
    
    mysql-test/r/func_time.result:
      After merge fix
    sql/table.cc:
      After merge fix
    81f99b95
table.cc 116 KB