• unknown's avatar
    Merge mysql.com:/nfsdisk1/lars/bk/mysql-5.0-rpl · 38164dad
    unknown authored
    into  mysql.com:/nfsdisk1/lars/bk/mysql-5.1-new-rpl
    
    
    mysql-test/r/mysqlbinlog.result:
      Auto merged
    mysql-test/r/rpl_replicate_do.result:
      Auto merged
    mysql-test/t/mysqlbinlog.test:
      Auto merged
    mysql-test/t/rpl_replicate_do.test:
      Auto merged
    sql/mysql_priv.h:
      Auto merged
    sql/mysqld.cc:
      Auto merged
    sql/sql_repl.cc:
      Auto merged
    sql/sql_trigger.cc:
      Auto merged
    sql/sql_trigger.h:
      Auto merged
    sql/slave.cc:
      Manual merge
    sql/sql_insert.cc:
      Manual merge
    sql/sql_parse.cc:
      Manual merge
    sql/sql_yacc.yy:
      Manual merge
    38164dad
rpl_replicate_do.result 2.5 KB