-
unknown authored
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
64dbfdd7