• unknown's avatar
    Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 · efc190e7
    unknown authored
    into  neptunus.(none):/home/msvensson/mysql/ssl_test/my50-ssl_test
    
    
    client/mysqltest.c:
      Auto merged
    mysql-test/mysql-test-run.pl:
      Auto merged
    mysql-test/t/information_schema.test:
      Auto merged
    mysql-test/t/myisam.test:
      Auto merged
    mysql-test/t/mysqltest.test:
      Auto merged
    mysql-test/t/rpl_openssl.test:
      Auto merged
    sql/mysqld.cc:
      Auto merged
    mysql-test/t/sp-security.test:
      Auto merged
    sql/sql_show.cc:
      Auto merged
    sql/structs.h:
      Auto merged
    mysql-test/r/mysqltest.result:
      SCCS merged
    efc190e7
mysqltest.result 14 KB