• Alexander Nozdrin's avatar
    Manual merge from mysql-trunk. · fe8f7052
    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
    fe8f7052
rpl_begin_commit_rollback.result 5.22 KB