summaryrefslogtreecommitdiff
path: root/mysql-test/include/have_innodb.inc
diff options
context:
space:
mode:
authorunknown <sasha@mysql.sashanet.com>2001-10-04 15:42:25 -0600
committerunknown <sasha@mysql.sashanet.com>2001-10-04 15:42:25 -0600
commit5ee900d38a1d20247823ab23a441cbb78ac9942a (patch)
tree52920ad20ad4c024921ea3c2bcf4c346c403290e /mysql-test/include/have_innodb.inc
parent07ccd64e7425f3bd09f7de05200835583f206c4a (diff)
downloadmariadb-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/have_innodb.inc')
-rw-r--r--mysql-test/include/have_innodb.inc2
1 files changed, 2 insertions, 0 deletions
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;