1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00

Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0

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
This commit is contained in:
unknown
2005-10-12 13:59:00 +02:00
24 changed files with 9305 additions and 122 deletions

View File

@ -1,4 +0,0 @@
-- require r/have_openssl_1.require
disable_query_log;
SHOW STATUS LIKE 'Ssl_cipher';
enable_query_log;