lots of post-merge changes

10 files changed, 21 insertions, 37 deletions

diff --git a/mysql-test/include/ctype_numconv.inc b/mysql-test/include/ctype_numconv.inc
index 06a9107e963..e32ed4103b5 100644
--- a/mysql-test/include/ctype_numconv.inc
+++ b/mysql-test/include/ctype_numconv.inc
@@ -1,3 +1,5 @@
+SET TIME_ZONE = _latin1 '+03:00';
+
 --echo #
 --echo # Start of WL#2649 Number-to-string conversions
 --echo #
diff --git a/mysql-test/include/diff_tables.inc b/mysql-test/include/diff_tables.inc
index 1013f81d6f3..28ed6a1d137 100644
--- a/mysql-test/include/diff_tables.inc
+++ b/mysql-test/include/diff_tables.inc
@@ -54,12 +54,10 @@
 
 --echo Comparing tables $diff_table_1 and $diff_table_2
 disable_query_log;
-disable_warnings;
 --error 0,1
 --remove_file $MYSQLTEST_VARDIR/tmp/diff_table_1
 --error 0,1
 --remove_file $MYSQLTEST_VARDIR/tmp/diff_table_2
-enable_warnings;
 
 
 let $_diff_table=$diff_table_2;
diff --git a/mysql-test/include/have_dynamic_loading.inc b/mysql-test/include/have_dynamic_loading.inc
deleted file mode 100644
index 3ce9641d87c..00000000000
--- a/mysql-test/include/have_dynamic_loading.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# Whether server supports dynamic loading.
-#
-if (`SELECT @@have_dynamic_loading != 'YES'`) {
-  --skip The test requires dynamic loading
-}
-disable_query_log;
-show variables like 'have_dynamic_loading';
-enable_query_log;
diff --git a/mysql-test/include/have_example_plugin.inc b/mysql-test/include/have_example_plugin.inc
index 21e3c33865e..bb84313eb4d 100644
--- a/mysql-test/include/have_example_plugin.inc
+++ b/mysql-test/include/have_example_plugin.inc
@@ -8,7 +8,6 @@ if (`SELECT @@have_dynamic_loading != 'YES'`) {
 #
 # Check if the variable HA_EXAMPLE_SO is set
 #
---require r/have_example_plugin.require
-disable_query_log;
-eval select LENGTH('$HA_EXAMPLE_SO') > 0 as 'have_example_plugin';
-enable_query_log;
+if (`SELECT LENGTH('$HA_EXAMPLE_SO') = 0`) {
+  --skip Need example plugin
+}
diff --git a/mysql-test/include/have_innodb.opt b/mysql-test/include/have_innodb.opt
index 4fb96229a7b..5d9121b3dc3 100644
--- a/mysql-test/include/have_innodb.opt
+++ b/mysql-test/include/have_innodb.opt
@@ -1,2 +1,2 @@
 --loose-innodb
---plugin-load=$HA_XTRADB_SO
+--plugin-load=$HA_INNODB_SO
diff --git a/mysql-test/include/have_semisync_plugin.inc b/mysql-test/include/have_semisync_plugin.inc
index d3b42dbf5fb..62dbf878825 100644
--- a/mysql-test/include/have_semisync_plugin.inc
+++ b/mysql-test/include/have_semisync_plugin.inc
@@ -6,16 +6,10 @@ if (`SELECT @@have_dynamic_loading != 'YES'`) {
 }
 
 #
-# Check if the variable SEMISYNC_MASTER_PLUGIN is set
+# Check if the variable SEMISYNC_MASTER_SO is set
 #
-if (`select LENGTH('$SEMISYNC_MASTER_PLUGIN') = 0`)
+if (`select LENGTH('$SEMISYNC_MASTER_SO') = 0`)
 {
   skip Need semisync plugins;
 }
 
-#
-# Check if --plugin-dir was setup for semisync
-#
-if (`SELECT CONCAT('--plugin-dir=', @@plugin_dir) != '$SEMISYNC_PLUGIN_OPT'`) {
-  --skip SEMISYNC plugin requires that --plugin-dir is set to the semisync plugin dir (either the .opt file does not contain \$SEMISYNC_PLUGIN_OPT or another plugin is in use)
-}
diff --git a/mysql-test/include/have_simple_parser.inc b/mysql-test/include/have_simple_parser.inc
index 008116cd8cb..100c8fc7a5a 100644
--- a/mysql-test/include/have_simple_parser.inc
+++ b/mysql-test/include/have_simple_parser.inc
@@ -8,7 +8,6 @@ if (`SELECT @@have_dynamic_loading != 'YES'`) {
 #
 # Check if the variable MYPLUGLIB_SO is set
 #
---require r/have_simple_parser.require
-disable_query_log;
-eval select LENGTH('$MYPLUGLIB_SO') > 0 as 'have_simple_parser';
-enable_query_log;
+if (`SELECT LENGTH('$MYPLUGLIB_SO') = 0`) {
+  --skip simple parser is not built (no mypluglib.so)
+}
diff --git a/mysql-test/include/have_udf.inc b/mysql-test/include/have_udf.inc
index 1d0782746c4..1953cb4b303 100644
--- a/mysql-test/include/have_udf.inc
+++ b/mysql-test/include/have_udf.inc
@@ -8,7 +8,7 @@ if (`SELECT @@have_dynamic_loading != 'YES'`) {
 #
 # Check if the variable UDF_EXAMPLE_SO is set
 #
---require r/have_udf_example.require
-disable_query_log;
-eval select LENGTH('$UDF_EXAMPLE_SO') > 0 as 'have_udf_example_lib';
-enable_query_log;
+#
+if (`SELECT LENGTH('$UDF_EXAMPLE_SO') = 0`) {
+  --skip Need udf example
+}
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;
+}
diff --git a/mysql-test/include/mysqld--help.inc b/mysql-test/include/mysqld--help.inc
index 3c50e50ac0e..36e9af6d429 100644
--- a/mysql-test/include/mysqld--help.inc
+++ b/mysql-test/include/mysqld--help.inc
@@ -14,7 +14,7 @@ perl;
                log-slow-queries pid-file slow-query-log-file
 			   datadir slave-load-tmpdir tmpdir/;
   @plugins=qw/innodb ndb archive blackhole federated partition ndbcluster debug temp-pool ssl des-key-file
-              thread-concurrency super-large-pages mutex-deadlock-detector null-audit/;
+              thread-concurrency super-large-pages mutex-deadlock-detector null-audit maria aria pbxt oqgraph sphinx/;
   @env=qw/MYSQLTEST_VARDIR MYSQL_TEST_DIR MYSQL_LIBDIR MYSQL_CHARSETSDIR MYSQL_SHAREDIR /;
   $re1=join('|', @skipvars, @plugins);
   $re2=join('|', @plugins);