unknown d52a1a144b Merge host.loc:/home/uchum/work/5.1-opt-33699 ... into host.loc:/home/uchum/work/5.1-opt mysql-test/extra/rpl_tests/rpl_extraMaster_Col.test: Auto merged sql/sql_update.cc: Auto merged mysql-test/suite/rpl/r/rpl_extraColmaster_innodb.result: Merge with local tree (bug#33699). mysql-test/suite/rpl/r/rpl_extraColmaster_myisam.result: Merge with local tree (bug#33699).		2008-01-11 21:39:45 +04:00
..
binlog_tests	Merge mysql.com:/home/ram/work/b32726/b32726.5.0	2007-11-29 14:35:15 +04:00
rpl_tests	Merge host.loc:/home/uchum/work/5.1-opt-33699	2008-01-11 21:39:45 +04:00