summaryrefslogtreecommitdiff
path: root/mysql-test/include
diff options
context:
space:
mode:
authorunknown <msvensson@neptunus.(none)>2005-06-22 12:41:33 +0200
committerunknown <msvensson@neptunus.(none)>2005-06-22 12:41:33 +0200
commit19f51d3fa50e1ffda7e25eabc879b63627920a81 (patch)
tree4b67667a07f06bea26eb88289c3a40808ae8f6b7 /mysql-test/include
parent2af65b1d712834884e0865c5b2e45cfa22ef36c5 (diff)
parent2e0ac6d642a0fb328ad80c21c2c310166cab9452 (diff)
downloadmariadb-git-19f51d3fa50e1ffda7e25eabc879b63627920a81.tar.gz
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
into neptunus.(none):/home/msvensson/mysql/bug10589
Diffstat (limited to 'mysql-test/include')
-rw-r--r--mysql-test/include/not_openssl.inc4
1 files changed, 4 insertions, 0 deletions
diff --git a/mysql-test/include/not_openssl.inc b/mysql-test/include/not_openssl.inc
new file mode 100644
index 00000000000..afe2ed37c28
--- /dev/null
+++ b/mysql-test/include/not_openssl.inc
@@ -0,0 +1,4 @@
+-- require r/not_openssl.require
+disable_query_log;
+show variables like "have_openssl";
+enable_query_log;