From 0accbd0364e0333e0b119aa9ce93e34ded9df6cb Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Mon, 25 Apr 2011 17:22:25 +0200 Subject: lots of post-merge changes --- mysql-test/include/have_xtradb.inc | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'mysql-test/include/have_xtradb.inc') diff --git a/mysql-test/include/have_xtradb.inc b/mysql-test/include/have_xtradb.inc index 6c2fc5155a9..5832267375c 100644 --- a/mysql-test/include/have_xtradb.inc +++ b/mysql-test/include/have_xtradb.inc @@ -1,4 +1,5 @@ -disable_query_log; ---require r/true.require -SELECT (plugin_description LIKE '%xtradb%') AS `TRUE` FROM information_schema.plugins WHERE LOWER(plugin_name) = 'innodb' AND LOWER(plugin_status) = 'active'; -enable_query_log; +if (!`SELECT count(*) FROM information_schema.plugins WHERE + plugin_name = 'innodb' AND plugin_status = 'active' AND + plugin_description LIKE '%xtradb%'`){ + skip Needs XtraDB engine; +} -- cgit v1.2.1