• Alexander Nozdrin's avatar
    Manual merge from mysql-trunk. · 762b535d
    Alexander Nozdrin authored
    Conflicts:
      - mysql-test/suite/engines/funcs/t/disabled.def
      - mysql-test/suite/engines/iuds/t/disabled.def
      - mysql-test/suite/engines/iuds/t/insert_number.test
    762b535d
disabled.def 175 Bytes