mariadb/mysql-test/suite/rpl_ndb
unknown 82cc70959e Merge kindahl-laptop.dnsalias.net:/home/bkroot/mysql-5.1-rpl
into  kindahl-laptop.dnsalias.net:/home/bk/b28618-mysql-5.1-rpl


mysql-test/suite/rpl_ndb/r/rpl_ndb_extraCol.result:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/log_event.h:
  Auto merged
sql/rpl_rli.h:
  Auto merged
sql/slave.cc:
  Auto merged
2007-10-22 08:50:08 +02:00
..
r Merge kindahl-laptop.dnsalias.net:/home/bkroot/mysql-5.1-rpl 2007-10-22 08:50:08 +02:00
t Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl 2007-10-12 13:24:28 +02:00