summaryrefslogtreecommitdiff
path: root/mysql-test/include
diff options
context:
space:
mode:
authorunknown <brian@brian-akers-computer.local>2004-06-05 10:43:22 -0700
committerunknown <brian@brian-akers-computer.local>2004-06-05 10:43:22 -0700
commit895efc07ac23ba8108fb2061b9f6ca0373613195 (patch)
tree4b15ba557e8f5854406099ae872ab75e795d8e68 /mysql-test/include
parent0fc147494a50789506f19ffe91324244b1bf5829 (diff)
parent1ceef15c40a9780828aa61f7154e730f1ea25681 (diff)
downloadmariadb-git-895efc07ac23ba8108fb2061b9f6ca0373613195.tar.gz
Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1
into brian-akers-computer.local:/Users/brian/mysql/mysql-4.1 BitKeeper/etc/logging_ok: auto-union acconfig.h: Auto merged acinclude.m4: Auto merged configure.in: Auto merged sql/handler.cc: Auto merged sql/handler.h: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/set_var.cc: Auto merged
Diffstat (limited to 'mysql-test/include')
-rw-r--r--mysql-test/include/have_archive.inc4
1 files changed, 4 insertions, 0 deletions
diff --git a/mysql-test/include/have_archive.inc b/mysql-test/include/have_archive.inc
new file mode 100644
index 00000000000..f7fb942e83e
--- /dev/null
+++ b/mysql-test/include/have_archive.inc
@@ -0,0 +1,4 @@
+-- require r/have_archive.require
+disable_query_log;
+show variables like "have_archive";
+enable_query_log;