• unknown's avatar
    Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · 306be7fe
    unknown authored
    into  vajra.(none):/opt/local/work/mysql-5.1-runtime
    
    
    mysql-test/r/information_schema.result:
      Auto merged
    mysql-test/r/openssl_1.result:
      Manual resolve.
    mysql-test/t/openssl_1.test:
      Manual resolve.
    306be7fe
openssl_1.test 4.18 KB