• Alexander Nozdrin's avatar
    Manual merge from mysql-trunk. · 42e80281
    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
    42e80281
rpl_stm_mixing_engines.result 596 KB