summaryrefslogtreecommitdiff
path: root/mysql-test/t/plugin.test
diff options
context:
space:
mode:
authorunknown <knielsen@knielsen-hq.org>2009-11-30 22:37:27 +0100
committerunknown <knielsen@knielsen-hq.org>2009-11-30 22:37:27 +0100
commit7af12a0d7234777d7dc01ebf114cdfbf09dcd072 (patch)
tree4a9d9e50072d36ee917a570f8bf83a0117e971db /mysql-test/t/plugin.test
parentf12371c8601774eba10d42ddaf6399334f3378e1 (diff)
parentdc51f0e1ebf14233025f2723289d238bf43041cf (diff)
downloadmariadb-git-7af12a0d7234777d7dc01ebf114cdfbf09dcd072.tar.gz
Merge MySQL 5.1.41 into MariaDB trunk, including a number of after-merge fixes.
Also merge charset patch.
Diffstat (limited to 'mysql-test/t/plugin.test')
-rw-r--r--mysql-test/t/plugin.test1
1 files changed, 1 insertions, 0 deletions
diff --git a/mysql-test/t/plugin.test b/mysql-test/t/plugin.test
index 7fc62b445c9..788a7b336ef 100644
--- a/mysql-test/t/plugin.test
+++ b/mysql-test/t/plugin.test
@@ -1,3 +1,4 @@
+--source include/not_windows_embedded.inc
--source include/have_example_plugin.inc
CREATE TABLE t1(a int) ENGINE=EXAMPLE;