• unknown's avatar
    Merge mysql.com:/home/my/mysql-4.0 · d70aead7
    unknown authored
    into  mysql.com:/home/my/mysql-4.1
    
    
    BitKeeper/etc/ignore:
      auto-union
    include/thr_lock.h:
      Auto merged
    mysys/thr_lock.c:
      Auto merged
    sql/lock.cc:
      Auto merged
    sql/mysql_priv.h:
      Auto merged
    sql/slave.cc:
      Auto merged
    sql/sql_base.cc:
      Simple merge
    d70aead7
slave.cc 140 KB