• unknown's avatar
    Merge mysql.com:/users/lthalmann/bk/mysql-5.0-rpl · 1e561f55
    unknown authored
    into  mysql.com:/users/lthalmann/bk/mysql-5.1-new-rpl
    
    
    BitKeeper/deleted/.del-mysys.vcproj~40a49d09c4184822:
      Auto merged
    mysql-test/t/rpl_openssl.test:
      Auto merged
    sql/log.cc:
      Auto merged
    BitKeeper/deleted/.del-mysql.sln~76a9ff1e793b3547:
      Deleted file in 5.1 (removed)
    BitKeeper/deleted/.del-mysqld.vcproj~6aa7b3f9c3e28fcb:
      Deleted file in 5.1 (removed)
    include/my_sys.h:
      Manual merge
    mysql-test/mysql-test-run.pl:
      Manual merge
    1e561f55
my_sys.h 35.8 KB