• unknown's avatar
    Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0 · 5084b6b7
    unknown authored
    into mysql.com:/home/mysql_src/mysql-5.0-new-binlog-format
    
    
    include/my_sys.h:
      Auto merged
    mysql-test/r/rpl_max_relay_size.result:
      Auto merged
    mysql-test/r/rpl_rotate_logs.result:
      Auto merged
    mysql-test/r/rpl_trunc_binlog.result:
      Auto merged
    mysql-test/t/rpl_log_pos.test:
      Auto merged
    mysql-test/t/rpl_max_relay_size.test:
      Auto merged
    mysql-test/t/rpl_rotate_logs.test:
      Auto merged
    mysql-test/t/rpl_trunc_binlog.test:
      Auto merged
    sql/ha_innodb.cc:
      Auto merged
    sql/log.cc:
      Auto merged
    sql/log_event.cc:
      Auto merged
    sql/log_event.h:
      Auto merged
    sql/mysql_priv.h:
      Auto merged
    sql/mysqld.cc:
      Auto merged
    sql/slave.cc:
      Auto merged
    sql/sql_class.cc:
      Auto merged
    sql/sql_class.h:
      Auto merged
    sql/sql_repl.cc:
      Auto merged
    5084b6b7
rpl_rotate_logs.result 4.29 KB