• unknown's avatar
    Merge mysql.com:/home/kent/bk/config_h/mysql-5.0-build · 813c2510
    unknown authored
    into  mysql.com:/home/kent/bk/config_h/mysql-5.1-build
    
    
    config/ac-macros/misc.m4:
      Auto merged
    configure.in:
      Auto merged
    include/Makefile.am:
      Auto merged
    mysql-test/std_data/cacert.pem:
      Auto merged
    mysql-test/std_data/client-cert.pem:
      Auto merged
    mysql-test/std_data/client-key.pem:
      Auto merged
    mysql-test/std_data/server-cert.pem:
      Auto merged
    mysql-test/std_data/server-key.pem:
      Auto merged
    mysys/my_pthread.c:
      Auto merged
    scripts/make_binary_distribution.sh:
      Auto merged
    BitKeeper/deleted/.del-Makefile.am~de166d6fcac3b9b6:
      Auto merged
    813c2510
Makefile.am 7.05 KB