• unknown's avatar
    merge with 4.0.15 · 0fa52795
    unknown authored
    
    BitKeeper/etc/ignore:
      auto-union
    BitKeeper/etc/logging_ok:
      auto-union
    BitKeeper/deleted/.del-database.c~af098622e818ce0d:
      Auto merged
    BitKeeper/deleted/.del-have_openssl_2.inc~8c9f1a45676b698f:
      Auto merged
    BitKeeper/deleted/.del-have_openssl_2.require~53bbdfc136fb514:
      Auto merged
    BitKeeper/deleted/.del-mini_client.cc~8677895ec8169183:
      Auto merged
    BitKeeper/deleted/.del-openssl_2.test~f2dfa927f19d14f8:
      Auto merged
    Build-tools/Bootstrap:
      Auto merged
    Build-tools/Do-compile:
      Auto merged
    SSL/cacert.pem:
      Auto merged
    acconfig.h:
      Auto merged
    acinclude.m4:
      Auto merged
    configure.in:
      Auto merged
    SSL/client-cert.pem:
      Auto merged
    SSL/client-key.pem:
      Auto merged
    SSL/server-cert.pem:
      Auto merged
    SSL/server-key.pem:
      Auto merged
    VC++Files/client/mysql.dsp:
      Auto merged
    VC++Files/client/mysqladmin.dsp:
      Auto merged
    VC++Files/client/mysqlclient.dsp:
      Auto merged
    VC++Files/client/mysqldump.dsp:
      Auto merged
    VC++Files/client/mysqlimport.dsp:
      Auto merged
    VC++Files/clie...
    0fa52795
acconfig.h 7.53 KB