unknown 64dbfdd7db Merge mysql1000.(none):/mnt/nb/home/elkin/MySQL/TEAM/FIXES/5.1/bug32971-error_propag_slave ...

into  mysql1000.(none):/home/andrei/MySQL/FIXES/5.1/bug32971-rbr_error_prop


mysql-test/extra/rpl_tests/rpl_row_tabledefs.test:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/log_event.h:
  Auto merged
mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result:
  manual merge use local
mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result:
  manual merge use local

2008-01-31 17:02:29 +02:00

..

binlog_tests

fix test failure

2008-01-22 09:55:23 +08:00

rpl_tests

Merge mysql1000.(none):/mnt/nb/home/elkin/MySQL/TEAM/FIXES/5.1/bug32971-error_propag_slave

2008-01-31 17:02:29 +02:00