Merge mysql-trunk into mysql-trunk-innodb

6 files changed, 28 insertions, 2 deletions

diff --git a/mysql-test/include/commit.inc b/mysql-test/include/commit.inc
index 59d4f6be524..c0d30b56ef7 100644
--- a/mysql-test/include/commit.inc
+++ b/mysql-test/include/commit.inc
@@ -640,9 +640,9 @@ call p_verify_status_increment(2, 0, 1, 0);
 --echo # 25. DDL: DROP TEMPORARY TABLE, does not start a transaction
 --echo #
 drop temporary table t2;
-call p_verify_status_increment(1, 0, 0, 0);
+call p_verify_status_increment(1, 0, 1, 0);
 commit;
-call p_verify_status_increment(1, 0, 0, 0);
+call p_verify_status_increment(1, 0, 1, 0);
 
 --echo # 26. Verify that SET AUTOCOMMIT issues an implicit commit
 --echo #
diff --git a/mysql-test/include/ctype_utf8_table.inc b/mysql-test/include/ctype_utf8_table.inc
index 28db21c06d2..006b03528bc 100644
--- a/mysql-test/include/ctype_utf8_table.inc
+++ b/mysql-test/include/ctype_utf8_table.inc
@@ -1,6 +1,8 @@
 CREATE TABLE t1 (a CHAR(1)) CHARACTER SET utf8;
 INSERT INTO t1 VALUES ('0'),('1'),('2'),('3'),('4'),('5'),('6'),('7');
 INSERT INTO t1 VALUES ('8'),('9'),('A'),('B'),('C'),('D'),('E'),('F');
+
+--disable_warnings
 #
 # Populate tables head and tail with values '00'-'FF'
 #
@@ -40,5 +42,6 @@ AND (middle BETWEEN '80' AND 'BF')
 AND (tail BETWEEN '80' AND 'BF')
 AND NOT (head='E0' AND middle BETWEEN '80' AND '9F')
 ORDER BY head, middle, tail;
+--disable_warnings
 
 SELECT count(*) FROM t1;
diff --git a/mysql-test/include/have_archive_plugin.inc b/mysql-test/include/have_archive_plugin.inc
new file mode 100644
index 00000000000..98e146ca20b
--- /dev/null
+++ b/mysql-test/include/have_archive_plugin.inc
@@ -0,0 +1,5 @@
+if (`select plugin_library IS NULL from information_schema.plugins where plugin_name LIKE '%archive%'`)
+{
+  --skip archive plugin not available
+}
+
diff --git a/mysql-test/include/have_blackhole_plugin.inc b/mysql-test/include/have_blackhole_plugin.inc
new file mode 100644
index 00000000000..749efd343d6
--- /dev/null
+++ b/mysql-test/include/have_blackhole_plugin.inc
@@ -0,0 +1,5 @@
+if (`select plugin_library IS NULL from information_schema.plugins where plugin_name LIKE '%blackhole%'`)
+{
+  --skip blackhole plugin not available;
+}
+
diff --git a/mysql-test/include/have_federated_plugin.inc b/mysql-test/include/have_federated_plugin.inc
new file mode 100644
index 00000000000..5c7549de53f
--- /dev/null
+++ b/mysql-test/include/have_federated_plugin.inc
@@ -0,0 +1,5 @@
+if (`select plugin_library IS NULL from information_schema.plugins where plugin_name LIKE '%federated%'`)
+{
+  --skip federated plugin not available
+}
+
diff --git a/mysql-test/include/have_ssl_crypto_functs.inc b/mysql-test/include/have_ssl_crypto_functs.inc
new file mode 100644
index 00000000000..d32f059e4fa
--- /dev/null
+++ b/mysql-test/include/have_ssl_crypto_functs.inc
@@ -0,0 +1,8 @@
+-- require r/have_ssl_is_yes_or_disabled_only.require
+disable_query_log;
+# "yes" means that the ssl library is found and the server can communicate using SSL.
+# "no" means that there are no SSL functions in the server.
+# "disabled" means that ssl functions exist, but communication is disabled for some reason.
+replace_regex s/(YES|DISABLED)/yesordisabled/;
+show variables like "have_ssl";
+enable_query_log;