• unknown's avatar
    Merge gbichot3.local:/home/mysql_src/mysql-5.0-rpl-25507 · 6f032400
    unknown authored
    into  gbichot3.local:/home/mysql_src/mysql-5.1-rpl-25507
    
    
    mysql-test/r/rpl_insert_id.result:
      Auto merged
    sql/log.cc:
      Auto merged
    sql/log_event.cc:
      Auto merged
    sql/log_event.h:
      Auto merged
    sql/mysqld.cc:
      Auto merged
    sql/slave.cc:
      Auto merged
    sql/slave.h:
      Auto merged
    mysql-test/t/rpl_insert_id.test:
      will merge by hand
    sql/sql_insert.cc:
      will fix by hand
    6f032400
log.cc 142 KB