• Alfranio Correia's avatar
    merge mysql-5.1 --> mysql-5.5 · 885de0c0
    Alfranio Correia authored
    Conflicts:
      
      . mysql-test/extra/rpl_tests/rpl_insert_ignore.test
      . mysql-test/suite/rpl/t/disabled.def
      . mysql-test/suite/rpl/t/rpl_insert_ignore.test
      . sql/sql_insert.cc
      . sql/sql_repl.cc
    885de0c0
disabled.def 1.13 KB