Alfranio Correia 318bdb6c66 merge mysql-5.1 --> mysql-5.5 ...

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

2011-01-31 13:11:05 +00:00

..

binlog_tests

BUG#58416

2010-12-07 14:26:20 +00:00

rpl_tests

merge mysql-5.1 --> mysql-5.5

2011-01-31 13:11:05 +00:00