• unknown's avatar
    Merge with 4.0.16 · e696d9e0
    unknown authored
    
    BitKeeper/etc/ignore:
      auto-union
    BitKeeper/etc/logging_ok:
      auto-union
    BitKeeper/deleted/.del-mysqldump.result:
      Delete: mysql-test/r/mysqldump.result
    BitKeeper/deleted/.del-mysqldump.test:
      Delete: mysql-test/t/mysqldump.test
    BitKeeper/deleted/.del-compile-netware-max:
      Delete: netware/BUILD/compile-netware-max
    BitKeeper/deleted/.del-compile-netware-max-debug:
      Delete: netware/BUILD/compile-netware-max-debug
    BitKeeper/deleted/.del-compile-netware-src:
      Delete: netware/BUILD/compile-netware-src
    BitKeeper/deleted/.del-knetware.imp:
      Delete: netware/BUILD/knetware.imp
    BUILD/compile-pentium-valgrind-max:
      Auto merged
    BitKeeper/deleted/.del-mini_client.cc~8677895ec8169183:
      Auto merged
    BitKeeper/deleted/.del-mysql_fix_privilege_tables.sql:
      Auto merged
    BitKeeper/deleted/.del-openssl.imp:
      Delete: netware/BUILD/openssl.imp
    acinclude.m4:
      Auto merged
    SSL/cacert.pem:
      Auto merged
    SSL/client-cert.pem:
      Auto merged
    SSL/server-cert.pem:
      Auto merged
    client/mysqlbinlog.cc:
      Auto ...
    e696d9e0
des_key_file.cc 3.36 KB