summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <knielsen@knielsen-hq.org>2009-05-22 19:53:25 +0200
committerunknown <knielsen@knielsen-hq.org>2009-05-22 19:53:25 +0200
commitd7ae55e70414b8e17a7c89a3f7843479a7260747 (patch)
tree69a62b35a721ed003daa03fe2cf88f3f72babdf5
parent48083d73d3dc6b1c678dbb6df3b49f420cce84ad (diff)
downloadmariadb-git-d7ae55e70414b8e17a7c89a3f7843479a7260747.tar.gz
Fix ps_not_windows test for -all-static build which cannot load plugins.
-rw-r--r--mysql-test/include/have_dynamic_loading.inc4
-rw-r--r--mysql-test/t/ps_not_windows.test2
2 files changed, 6 insertions, 0 deletions
diff --git a/mysql-test/include/have_dynamic_loading.inc b/mysql-test/include/have_dynamic_loading.inc
new file mode 100644
index 00000000000..ddd7c61a730
--- /dev/null
+++ b/mysql-test/include/have_dynamic_loading.inc
@@ -0,0 +1,4 @@
+-- require r/have_dynamic_loading.require
+disable_query_log;
+show variables like 'have_dynamic_loading';
+enable_query_log;
diff --git a/mysql-test/t/ps_not_windows.test b/mysql-test/t/ps_not_windows.test
index 6d85f737b32..1dceacd73da 100644
--- a/mysql-test/t/ps_not_windows.test
+++ b/mysql-test/t/ps_not_windows.test
@@ -2,6 +2,8 @@
--source include/not_embedded.inc
# Non-windows specific ps tests.
--source include/not_windows.inc
+# Requires ability to install plugins.
+--source include/have_dynamic_loading.inc
#
# Bug #20665: All commands supported in Stored Procedures should work in