• unknown's avatar
    Merge kindahl-laptop.dnsalias.net:/home/bkroot/mysql-5.1-rpl · 589ef1a7
    unknown authored
    into  kindahl-laptop.dnsalias.net:/home/bk/b29549-mysql-5.1-target-5.1.22
    
    
    mysql-test/suite/rpl/t/disabled.def:
      Auto merged
    mysql-test/suite/rpl_ndb/t/disabled.def:
      Auto merged
    sql/log.cc:
      Auto merged
    sql/rpl_record.cc:
      Auto merged
    sql/sql_show.cc:
      Auto merged
    BitKeeper/deleted/.del-rpl_ndb_innodb2ndb.result~1:
      Delete: mysql-test/suite/rpl_ndb/r/rpl_ndb_innodb2ndb.result
    BitKeeper/deleted/.del-rpl_ndb_myisam2ndb.result~1:
      Delete: mysql-test/suite/rpl_ndb/r/rpl_ndb_myisam2ndb.result
    mysql-test/suite/rpl_ndb/t/rpl_ndb_innodb2ndb-slave.opt:
      Manual merge
    mysql-test/suite/rpl_ndb/t/rpl_ndb_innodb2ndb.test:
      Manual merge
    mysql-test/suite/rpl_ndb/t/rpl_ndb_myisam2ndb-slave.opt:
      Manual merge
    mysql-test/suite/rpl_ndb/t/rpl_ndb_myisam2ndb.test:
      Manual merge
    sql/log_event.cc:
      Manual merge
    sql/field.cc:
      Manual merge and adding comment.
    sql/field.h:
      Manual merge.
    589ef1a7
log.cc 143 KB