• unknown's avatar
    Merge mysql.com:/home/bk/MERGE/mysql-4.1-merge · 1613ad2c
    unknown authored
    into  mysql.com:/home/bk/MERGE/mysql-5.0-merge
    
    
    BitKeeper/triggers/post-commit:
      Auto merged
    mysql-test/t/func_gconcat.test:
      Auto merged
    sql/item_sum.cc:
      Auto merged
    sql/sql_repl.cc:
      Auto merged
    sql/log_event.h:
      Manual merge
    sql/slave.cc:
      Manual merge
    1613ad2c
slave.cc 167 KB