diff options
| author | unknown <sasha@mysql.sashanet.com> | 2001-10-04 15:42:25 -0600 |
|---|---|---|
| committer | unknown <sasha@mysql.sashanet.com> | 2001-10-04 15:42:25 -0600 |
| commit | 5ee900d38a1d20247823ab23a441cbb78ac9942a (patch) | |
| tree | 52920ad20ad4c024921ea3c2bcf4c346c403290e /mysql-test/include | |
| parent | 07ccd64e7425f3bd09f7de05200835583f206c4a (diff) | |
| download | mariadb-git-5ee900d38a1d20247823ab23a441cbb78ac9942a.tar.gz | |
changes to make things work in the max version
acinclude.m4:
automatically detect installation paths of OpenSSL instead of hard-coding
automatically enable --with-vio if --with-openssl is enabled
client/mysqltest.c:
fixes for embedded library
libmysqld/Makefile.am:
md5 is now in mysys
libmysqld/libmysqld.c:
added my_connect(), but now can be removed - will do in the next
changeset
mysql-test/include/have_bdb.inc:
disable query log so that result file will not have unneeded
show variables
mysql-test/include/have_gemini.inc:
disable query log so that result file will not have unneeded
show variables
mysql-test/include/have_innodb.inc:
disable query log so that result file will not have unneeded
show variables
mysql-test/include/have_openssl.inc:
disable query log so that result file will not have unneeded
show variables
mysql-test/include/have_openssl_1.inc:
disable query log so that result file will not have unneeded
show variables
mysql-test/include/have_openssl_2.inc:
disable query log so that result file will not have unneeded
show variables
mysql-test/r/bdb.result:
fix for new format
mysql-test/r/have_openssl.require:
ssl->openssl
mysql-test/r/innodb.result:
fix for query logging
Diffstat (limited to 'mysql-test/include')
| -rw-r--r-- | mysql-test/include/have_bdb.inc | 2 | ||||
| -rw-r--r-- | mysql-test/include/have_gemini.inc | 2 | ||||
| -rw-r--r-- | mysql-test/include/have_innodb.inc | 2 | ||||
| -rw-r--r-- | mysql-test/include/have_openssl.inc | 2 | ||||
| -rw-r--r-- | mysql-test/include/have_openssl_1.inc | 2 | ||||
| -rw-r--r-- | mysql-test/include/have_openssl_2.inc | 2 |
6 files changed, 12 insertions, 0 deletions
diff --git a/mysql-test/include/have_bdb.inc b/mysql-test/include/have_bdb.inc index 0126e30210f..3f7377e7515 100644 --- a/mysql-test/include/have_bdb.inc +++ b/mysql-test/include/have_bdb.inc @@ -1,2 +1,4 @@ -- require r/have_bdb.require +disable_query_log; show variables like "have_bdb"; +enable_query_log; diff --git a/mysql-test/include/have_gemini.inc b/mysql-test/include/have_gemini.inc index 78a84ac6f3e..d98c9750714 100644 --- a/mysql-test/include/have_gemini.inc +++ b/mysql-test/include/have_gemini.inc @@ -1,2 +1,4 @@ -- require r/have_gemini.require +disable_query_log; show variables like "have_gemini"; +enable_query_log; diff --git a/mysql-test/include/have_innodb.inc b/mysql-test/include/have_innodb.inc index 7dcaef44878..4f83d378cbc 100644 --- a/mysql-test/include/have_innodb.inc +++ b/mysql-test/include/have_innodb.inc @@ -1,2 +1,4 @@ -- require r/have_innodb.require +disable_query_log; show variables like "have_innodb"; +enable_query_log; diff --git a/mysql-test/include/have_openssl.inc b/mysql-test/include/have_openssl.inc index b9aa2dadb9e..54c5b04b3e4 100644 --- a/mysql-test/include/have_openssl.inc +++ b/mysql-test/include/have_openssl.inc @@ -1,2 +1,4 @@ -- require r/have_openssl.require +disable_query_log; show variables like "have_openssl"; +enable_query_log; diff --git a/mysql-test/include/have_openssl_1.inc b/mysql-test/include/have_openssl_1.inc index 5aa93b688f3..4d3646abdc2 100644 --- a/mysql-test/include/have_openssl_1.inc +++ b/mysql-test/include/have_openssl_1.inc @@ -1,2 +1,4 @@ -- require r/have_openssl_1.require +disable_query_log; show variables like "have_openssl"; +enable_query_log; diff --git a/mysql-test/include/have_openssl_2.inc b/mysql-test/include/have_openssl_2.inc index b15af43715b..724d295a398 100644 --- a/mysql-test/include/have_openssl_2.inc +++ b/mysql-test/include/have_openssl_2.inc @@ -1,2 +1,4 @@ -- require r/have_openssl_2.require +disable_query_log; SHOW STATUS LIKE "SSL_get_cipher"; +enable_query_log; |