diff --git a/mysql-test/lib/My/SafeProcess/safe_process.cc b/mysql-test/lib/My/SafeProcess/safe_process.cc
index feb3eb4df66f9d02339a2f779f5c648a45f9fd54..8f18b137b871a5524e0b4c9b54c96467c64e9446 100644
--- a/mysql-test/lib/My/SafeProcess/safe_process.cc
+++ b/mysql-test/lib/My/SafeProcess/safe_process.cc
@@ -148,6 +148,14 @@ extern "C" void handle_signal(int sig)
 }
 
 
+void setlimit(int what, uint soft, uint hard)
+{
+  struct rlimit lim = { soft, hard };
+  if (setrlimit (what, &lim) < 0)
+    message("setrlimit failed, errno=%d", errno);
+}
+
+
 int main(int argc, char* const argv[] )
 {
   char* const* child_argv= 0;
@@ -249,13 +257,13 @@ int main(int argc, char* const argv[] )
     signal(SIGCHLD, SIG_DFL);
 
     if (nocore)
-    {
-      struct rlimit corelim = { 0, 0 };
-      if (setrlimit (RLIMIT_CORE, &corelim) < 0)
-      {
-        message("setrlimit failed, errno=%d", errno);
-      }
-    }
+      setlimit(RLIMIT_CORE, 0, 0);
+
+    /*
+      mysqld defaults depend on that. make test results stable and independent
+      from the environment
+    */
+    setlimit(RLIMIT_NOFILE, 1024, 1024);
 
     // Signal that child is ready
     buf= 37;
diff --git a/mysql-test/suite/jp/r/jp_convert_ucs2.result b/mysql-test/suite/jp/r/jp_convert_ucs2.result
index b16f54205596329f0e179357349b1ae65b1e6564..842ddfa2ea731dd7989c50d86c31e507c1e46e13 100644
--- a/mysql-test/suite/jp/r/jp_convert_ucs2.result
+++ b/mysql-test/suite/jp/r/jp_convert_ucs2.result
@@ -161,13 +161,13 @@ SELECT `
 忢磸淼忢稄矸忢笍砉忢簭砘忢紡斫忢緩砜忢缽砹忢聫砻忢膹砼忢茝砬	????????????????????
 忢葟砩忢蕪硭忢虖硗忢螐硐忢袕硌忢覐碛忢詮碚忢謴碜忢貜碣忢趶碹	????????????????????
 Warnings:
-Warning	1976	Cannot convert 'ucs2' character 0x02DB to 'sjis'
-Warning	1976	Cannot convert 'ucs2' character 0x9EF8 to 'sjis'
-Warning	1976	Cannot convert 'ucs2' character 0x4E5A to 'sjis'
-Warning	1976	Cannot convert 'ucs2' character 0x4EE1 to 'sjis'
-Warning	1976	Cannot convert 'ucs2' character 0x4F19 to 'sjis'
-Warning	1976	Cannot convert 'ucs2' character 0x9F2B to 'sjis'
-Warning	1976	Cannot convert 'ucs2' character 0x9F57 to 'sjis'
+Warning	1977	Cannot convert 'ucs2' character 0x02DB to 'sjis'
+Warning	1977	Cannot convert 'ucs2' character 0x9EF8 to 'sjis'
+Warning	1977	Cannot convert 'ucs2' character 0x4E5A to 'sjis'
+Warning	1977	Cannot convert 'ucs2' character 0x4EE1 to 'sjis'
+Warning	1977	Cannot convert 'ucs2' character 0x4F19 to 'sjis'
+Warning	1977	Cannot convert 'ucs2' character 0x9F2B to 'sjis'
+Warning	1977	Cannot convert 'ucs2' character 0x9F57 to 'sjis'
 SELECT `C1`, CONVERT(`C1` using utf8) FROM `T4`;
 C1	CONVERT(`C1` using utf8)
  帯帰帲帳帴帵帶帹帺帾帿幀幁幃幆	 帯帰帲帳帴帵帶帹帺帾帿幀幁幃幆
@@ -244,13 +244,13 @@ SELECT `
 忢磸淼忢稄矸忢笍砉忢簭砘忢紡斫忢緩砜忢缽砹忢聫砻忢膹砼忢茝砬	????????????????????
 忢葟砩忢蕪硭忢虖硗忢螐硐忢袕硌忢覐碛忢詮碚忢謴碜忢貜碣忢趶碹	????????????????????
 Warnings:
-Warning	1976	Cannot convert 'ucs2' character 0x02DB to 'sjis'
-Warning	1976	Cannot convert 'ucs2' character 0x9EF8 to 'sjis'
-Warning	1976	Cannot convert 'ucs2' character 0x4E5A to 'sjis'
-Warning	1976	Cannot convert 'ucs2' character 0x4EE1 to 'sjis'
-Warning	1976	Cannot convert 'ucs2' character 0x4F19 to 'sjis'
-Warning	1976	Cannot convert 'ucs2' character 0x9F2B to 'sjis'
-Warning	1976	Cannot convert 'ucs2' character 0x9F57 to 'sjis'
+Warning	1977	Cannot convert 'ucs2' character 0x02DB to 'sjis'
+Warning	1977	Cannot convert 'ucs2' character 0x9EF8 to 'sjis'
+Warning	1977	Cannot convert 'ucs2' character 0x4E5A to 'sjis'
+Warning	1977	Cannot convert 'ucs2' character 0x4EE1 to 'sjis'
+Warning	1977	Cannot convert 'ucs2' character 0x4F19 to 'sjis'
+Warning	1977	Cannot convert 'ucs2' character 0x9F2B to 'sjis'
+Warning	1977	Cannot convert 'ucs2' character 0x9F57 to 'sjis'
 SELECT `C1`, CONVERT(`C1` using utf8) FROM `T7`;
 C1	CONVERT(`C1` using utf8)
 PQRSTUVWXYZ[\]^_	PQRSTUVWXYZ[\]^_
@@ -327,13 +327,13 @@ SELECT `
 忢磸淼忢稄矸忢笍砉忢簭砘忢紡斫忢緩砜忢缽砹忢聫砻忢膹砼忢茝砬	????????????????????
 忢葟砩忢蕪硭忢虖硗忢螐硐忢袕硌忢覐碛忢詮碚忢謴碜忢貜碣忢趶碹	????????????????????
 Warnings:
-Warning	1976	Cannot convert 'ucs2' character 0x02DB to 'sjis'
-Warning	1976	Cannot convert 'ucs2' character 0x4E5A to 'sjis'
-Warning	1976	Cannot convert 'ucs2' character 0x4EE1 to 'sjis'
-Warning	1976	Cannot convert 'ucs2' character 0x4F19 to 'sjis'
-Warning	1976	Cannot convert 'ucs2' character 0x9EF8 to 'sjis'
-Warning	1976	Cannot convert 'ucs2' character 0x9F2B to 'sjis'
-Warning	1976	Cannot convert 'ucs2' character 0x9F57 to 'sjis'
+Warning	1977	Cannot convert 'ucs2' character 0x02DB to 'sjis'
+Warning	1977	Cannot convert 'ucs2' character 0x4E5A to 'sjis'
+Warning	1977	Cannot convert 'ucs2' character 0x4EE1 to 'sjis'
+Warning	1977	Cannot convert 'ucs2' character 0x4F19 to 'sjis'
+Warning	1977	Cannot convert 'ucs2' character 0x9EF8 to 'sjis'
+Warning	1977	Cannot convert 'ucs2' character 0x9F2B to 'sjis'
+Warning	1977	Cannot convert 'ucs2' character 0x9F57 to 'sjis'
 drop table `T1`;
 drop table `T2`;
 drop table `T3`;
diff --git a/mysql-test/suite/jp/r/jp_convert_ujis.result b/mysql-test/suite/jp/r/jp_convert_ujis.result
index 0f2aff23c0fc3f4755852ded8fda5f963ac63629..d47f6b4ef25d6c5da861331b3b13e1d59bcbcd8f 100644
--- a/mysql-test/suite/jp/r/jp_convert_ujis.result
+++ b/mysql-test/suite/jp/r/jp_convert_ujis.result
@@ -394,37 +394,37 @@ SELECT `
 ˇˇˇˇˇˇˇˇˇˇˇˇˇˇˇˇˇˇˇˇ	ˇˇˇˇˇˇˇˇˇˇˇˇˇˇˇˇˇˇˇˇ
 ˇˇˇˇˇˇˇˇˇˇˇˇˇˇˇˇˇˇˇˇ	ˇˇˇˇˇˇˇˇˇˇˇˇˇˇˇˇˇˇˇˇ
 Warnings:
-Warning	1976	Cannot convert 'ujis' character 0x8FA2F0 to 'sjis'
-Warning	1976	Cannot convert 'ujis' character 0x8FA7C8 to 'sjis'
-Warning	1976	Cannot convert 'ujis' character 0x8FA9C8 to 'sjis'
-Warning	1976	Cannot convert 'ujis' character 0x8FAAB4 to 'sjis'
-Warning	1976	Cannot convert 'ujis' character 0x8FAAC8 to 'sjis'
-Warning	1976	Cannot convert 'ujis' character 0x8FAADC to 'sjis'
-Warning	1976	Cannot convert 'ujis' character 0x8FAAF0 to 'sjis'
-Warning	1976	Cannot convert 'ujis' character 0x8FABB4 to 'sjis'
-Warning	1976	Cannot convert 'ujis' character 0x8FABC8 to 'sjis'
-Warning	1976	Cannot convert 'ujis' character 0x8FABDC to 'sjis'
-Warning	1976	Cannot convert 'ujis' character 0x8FABF0 to 'sjis'
-Warning	1976	Cannot convert 'ujis' character 0x8FB0B4 to 'sjis'
-Warning	1976	Cannot convert 'ujis' character 0x8FB0C8 to 'sjis'
-Warning	1976	Cannot convert 'ujis' character 0x8FB0DC to 'sjis'
-Warning	1976	Cannot convert 'ujis' character 0x8FB0F0 to 'sjis'
-Warning	1976	Cannot convert 'ujis' character 0x8FEDB4 to 'sjis'
-Warning	1976	Cannot convert 'ujis' character 0x8FEDC8 to 'sjis'
-Warning	1976	Cannot convert 'ujis' character 0x8FEDDC to 'sjis'
-Warning	1976	Cannot convert 'ujis' character 0x8FA2B5 to 'sjis'
-Warning	1976	Cannot convert 'ujis' character 0x8FA6F1 to 'sjis'
-Warning	1976	Cannot convert 'ujis' character 0x8FA9A1 to 'sjis'
-Warning	1976	Cannot convert 'ujis' character 0x8FAAA1 to 'sjis'
-Warning	1976	Cannot convert 'ujis' character 0x8FABA1 to 'sjis'
-Warning	1976	Cannot convert 'ujis' character 0x8FB0A1 to 'sjis'
-Warning	1976	Cannot convert 'ujis' character 0x8FEDA1 to 'sjis'
-Warning	1976	Cannot convert 'ujis' character 0x8FA7F2 to 'sjis'
-Warning	1976	Cannot convert 'ujis' character 0x8FA6E1 to 'sjis'
-Warning	1976	Cannot convert 'ujis' character 0x8FA9C1 to 'sjis'
-Warning	1976	Cannot convert 'ujis' character 0x8FA7C2 to 'sjis'
-Warning	1976	Cannot convert 'ujis' character 0x8FA2AF to 'sjis'
-Warning	1976	Cannot convert 'ujis' character 0x8FA2EB to 'sjis'
+Warning	1977	Cannot convert 'ujis' character 0x8FA2F0 to 'sjis'
+Warning	1977	Cannot convert 'ujis' character 0x8FA7C8 to 'sjis'
+Warning	1977	Cannot convert 'ujis' character 0x8FA9C8 to 'sjis'
+Warning	1977	Cannot convert 'ujis' character 0x8FAAB4 to 'sjis'
+Warning	1977	Cannot convert 'ujis' character 0x8FAAC8 to 'sjis'
+Warning	1977	Cannot convert 'ujis' character 0x8FAADC to 'sjis'
+Warning	1977	Cannot convert 'ujis' character 0x8FAAF0 to 'sjis'
+Warning	1977	Cannot convert 'ujis' character 0x8FABB4 to 'sjis'
+Warning	1977	Cannot convert 'ujis' character 0x8FABC8 to 'sjis'
+Warning	1977	Cannot convert 'ujis' character 0x8FABDC to 'sjis'
+Warning	1977	Cannot convert 'ujis' character 0x8FABF0 to 'sjis'
+Warning	1977	Cannot convert 'ujis' character 0x8FB0B4 to 'sjis'
+Warning	1977	Cannot convert 'ujis' character 0x8FB0C8 to 'sjis'
+Warning	1977	Cannot convert 'ujis' character 0x8FB0DC to 'sjis'
+Warning	1977	Cannot convert 'ujis' character 0x8FB0F0 to 'sjis'
+Warning	1977	Cannot convert 'ujis' character 0x8FEDB4 to 'sjis'
+Warning	1977	Cannot convert 'ujis' character 0x8FEDC8 to 'sjis'
+Warning	1977	Cannot convert 'ujis' character 0x8FEDDC to 'sjis'
+Warning	1977	Cannot convert 'ujis' character 0x8FA2B5 to 'sjis'
+Warning	1977	Cannot convert 'ujis' character 0x8FA6F1 to 'sjis'
+Warning	1977	Cannot convert 'ujis' character 0x8FA9A1 to 'sjis'
+Warning	1977	Cannot convert 'ujis' character 0x8FAAA1 to 'sjis'
+Warning	1977	Cannot convert 'ujis' character 0x8FABA1 to 'sjis'
+Warning	1977	Cannot convert 'ujis' character 0x8FB0A1 to 'sjis'
+Warning	1977	Cannot convert 'ujis' character 0x8FEDA1 to 'sjis'
+Warning	1977	Cannot convert 'ujis' character 0x8FA7F2 to 'sjis'
+Warning	1977	Cannot convert 'ujis' character 0x8FA6E1 to 'sjis'
+Warning	1977	Cannot convert 'ujis' character 0x8FA9C1 to 'sjis'
+Warning	1977	Cannot convert 'ujis' character 0x8FA7C2 to 'sjis'
+Warning	1977	Cannot convert 'ujis' character 0x8FA2AF to 'sjis'
+Warning	1977	Cannot convert 'ujis' character 0x8FA2EB to 'sjis'
 SELECT `C1`, CONVERT(`C1` using utf8) FROM `T4`;
 C1	CONVERT(`C1` using utf8)
  !"#$%&'()*+,-./	 !"#$%&'()*+,-./
@@ -792,37 +792,37 @@ SELECT `
 ˇˇˇˇˇˇˇˇˇˇˇˇˇˇˇˇˇˇˇˇ	ˇˇˇˇˇˇˇˇˇˇˇˇˇˇˇˇˇˇˇˇ
 ˇˇˇˇˇˇˇˇˇˇˇˇˇˇˇˇˇˇˇˇ	ˇˇˇˇˇˇˇˇˇˇˇˇˇˇˇˇˇˇˇˇ
 Warnings:
-Warning	1976	Cannot convert 'ujis' character 0x8FA2F0 to 'sjis'
-Warning	1976	Cannot convert 'ujis' character 0x8FA7C8 to 'sjis'
-Warning	1976	Cannot convert 'ujis' character 0x8FA9C8 to 'sjis'
-Warning	1976	Cannot convert 'ujis' character 0x8FAAB4 to 'sjis'
-Warning	1976	Cannot convert 'ujis' character 0x8FAAC8 to 'sjis'
-Warning	1976	Cannot convert 'ujis' character 0x8FAADC to 'sjis'
-Warning	1976	Cannot convert 'ujis' character 0x8FAAF0 to 'sjis'
-Warning	1976	Cannot convert 'ujis' character 0x8FABB4 to 'sjis'
-Warning	1976	Cannot convert 'ujis' character 0x8FABC8 to 'sjis'
-Warning	1976	Cannot convert 'ujis' character 0x8FABDC to 'sjis'
-Warning	1976	Cannot convert 'ujis' character 0x8FABF0 to 'sjis'
-Warning	1976	Cannot convert 'ujis' character 0x8FB0B4 to 'sjis'
-Warning	1976	Cannot convert 'ujis' character 0x8FB0C8 to 'sjis'
-Warning	1976	Cannot convert 'ujis' character 0x8FB0DC to 'sjis'
-Warning	1976	Cannot convert 'ujis' character 0x8FB0F0 to 'sjis'
-Warning	1976	Cannot convert 'ujis' character 0x8FEDB4 to 'sjis'
-Warning	1976	Cannot convert 'ujis' character 0x8FEDC8 to 'sjis'
-Warning	1976	Cannot convert 'ujis' character 0x8FEDDC to 'sjis'
-Warning	1976	Cannot convert 'ujis' character 0x8FA2B5 to 'sjis'
-Warning	1976	Cannot convert 'ujis' character 0x8FA6F1 to 'sjis'
-Warning	1976	Cannot convert 'ujis' character 0x8FA9A1 to 'sjis'
-Warning	1976	Cannot convert 'ujis' character 0x8FAAA1 to 'sjis'
-Warning	1976	Cannot convert 'ujis' character 0x8FABA1 to 'sjis'
-Warning	1976	Cannot convert 'ujis' character 0x8FB0A1 to 'sjis'
-Warning	1976	Cannot convert 'ujis' character 0x8FEDA1 to 'sjis'
-Warning	1976	Cannot convert 'ujis' character 0x8FA7F2 to 'sjis'
-Warning	1976	Cannot convert 'ujis' character 0x8FA6E1 to 'sjis'
-Warning	1976	Cannot convert 'ujis' character 0x8FA9C1 to 'sjis'
-Warning	1976	Cannot convert 'ujis' character 0x8FA7C2 to 'sjis'
-Warning	1976	Cannot convert 'ujis' character 0x8FA2AF to 'sjis'
-Warning	1976	Cannot convert 'ujis' character 0x8FA2EB to 'sjis'
+Warning	1977	Cannot convert 'ujis' character 0x8FA2F0 to 'sjis'
+Warning	1977	Cannot convert 'ujis' character 0x8FA7C8 to 'sjis'
+Warning	1977	Cannot convert 'ujis' character 0x8FA9C8 to 'sjis'
+Warning	1977	Cannot convert 'ujis' character 0x8FAAB4 to 'sjis'
+Warning	1977	Cannot convert 'ujis' character 0x8FAAC8 to 'sjis'
+Warning	1977	Cannot convert 'ujis' character 0x8FAADC to 'sjis'
+Warning	1977	Cannot convert 'ujis' character 0x8FAAF0 to 'sjis'
+Warning	1977	Cannot convert 'ujis' character 0x8FABB4 to 'sjis'
+Warning	1977	Cannot convert 'ujis' character 0x8FABC8 to 'sjis'
+Warning	1977	Cannot convert 'ujis' character 0x8FABDC to 'sjis'
+Warning	1977	Cannot convert 'ujis' character 0x8FABF0 to 'sjis'
+Warning	1977	Cannot convert 'ujis' character 0x8FB0B4 to 'sjis'
+Warning	1977	Cannot convert 'ujis' character 0x8FB0C8 to 'sjis'
+Warning	1977	Cannot convert 'ujis' character 0x8FB0DC to 'sjis'
+Warning	1977	Cannot convert 'ujis' character 0x8FB0F0 to 'sjis'
+Warning	1977	Cannot convert 'ujis' character 0x8FEDB4 to 'sjis'
+Warning	1977	Cannot convert 'ujis' character 0x8FEDC8 to 'sjis'
+Warning	1977	Cannot convert 'ujis' character 0x8FEDDC to 'sjis'
+Warning	1977	Cannot convert 'ujis' character 0x8FA2B5 to 'sjis'
+Warning	1977	Cannot convert 'ujis' character 0x8FA6F1 to 'sjis'
+Warning	1977	Cannot convert 'ujis' character 0x8FA9A1 to 'sjis'
+Warning	1977	Cannot convert 'ujis' character 0x8FAAA1 to 'sjis'
+Warning	1977	Cannot convert 'ujis' character 0x8FABA1 to 'sjis'
+Warning	1977	Cannot convert 'ujis' character 0x8FB0A1 to 'sjis'
+Warning	1977	Cannot convert 'ujis' character 0x8FEDA1 to 'sjis'
+Warning	1977	Cannot convert 'ujis' character 0x8FA7F2 to 'sjis'
+Warning	1977	Cannot convert 'ujis' character 0x8FA6E1 to 'sjis'
+Warning	1977	Cannot convert 'ujis' character 0x8FA9C1 to 'sjis'
+Warning	1977	Cannot convert 'ujis' character 0x8FA7C2 to 'sjis'
+Warning	1977	Cannot convert 'ujis' character 0x8FA2AF to 'sjis'
+Warning	1977	Cannot convert 'ujis' character 0x8FA2EB to 'sjis'
 SELECT `C1`, CONVERT(`C1` using utf8) FROM `T7`;
 C1	CONVERT(`C1` using utf8)
  !"#$%&'()*+,-./	 !"#$%&'()*+,-./
@@ -1190,37 +1190,37 @@ SELECT `
 忢軓磔忢迯磉忢鄰磲忢鈴磴ˇˇˇˇˇˇˇˇˇˇˇˇ	????????ˇˇˇˇˇˇˇˇˇˇˇˇ
 ˇˇˇˇˇˇˇˇˇˇˇˇˇˇˇˇˇˇˇˇ	ˇˇˇˇˇˇˇˇˇˇˇˇˇˇˇˇˇˇˇˇ
 Warnings:
-Warning	1976	Cannot convert 'ujis' character 0x8FA2AF to 'sjis'
-Warning	1976	Cannot convert 'ujis' character 0x8FA2B5 to 'sjis'
-Warning	1976	Cannot convert 'ujis' character 0x8FA2EB to 'sjis'
-Warning	1976	Cannot convert 'ujis' character 0x8FA2F0 to 'sjis'
-Warning	1976	Cannot convert 'ujis' character 0x8FA6E1 to 'sjis'
-Warning	1976	Cannot convert 'ujis' character 0x8FA6F1 to 'sjis'
-Warning	1976	Cannot convert 'ujis' character 0x8FA7C2 to 'sjis'
-Warning	1976	Cannot convert 'ujis' character 0x8FA7C8 to 'sjis'
-Warning	1976	Cannot convert 'ujis' character 0x8FA7F2 to 'sjis'
-Warning	1976	Cannot convert 'ujis' character 0x8FA9A1 to 'sjis'
-Warning	1976	Cannot convert 'ujis' character 0x8FA9C1 to 'sjis'
-Warning	1976	Cannot convert 'ujis' character 0x8FA9C8 to 'sjis'
-Warning	1976	Cannot convert 'ujis' character 0x8FAAA1 to 'sjis'
-Warning	1976	Cannot convert 'ujis' character 0x8FAAB4 to 'sjis'
-Warning	1976	Cannot convert 'ujis' character 0x8FAAC8 to 'sjis'
-Warning	1976	Cannot convert 'ujis' character 0x8FAADC to 'sjis'
-Warning	1976	Cannot convert 'ujis' character 0x8FAAF0 to 'sjis'
-Warning	1976	Cannot convert 'ujis' character 0x8FABA1 to 'sjis'
-Warning	1976	Cannot convert 'ujis' character 0x8FABB4 to 'sjis'
-Warning	1976	Cannot convert 'ujis' character 0x8FABC8 to 'sjis'
-Warning	1976	Cannot convert 'ujis' character 0x8FABDC to 'sjis'
-Warning	1976	Cannot convert 'ujis' character 0x8FABF0 to 'sjis'
-Warning	1976	Cannot convert 'ujis' character 0x8FB0A1 to 'sjis'
-Warning	1976	Cannot convert 'ujis' character 0x8FB0B4 to 'sjis'
-Warning	1976	Cannot convert 'ujis' character 0x8FB0C8 to 'sjis'
-Warning	1976	Cannot convert 'ujis' character 0x8FB0DC to 'sjis'
-Warning	1976	Cannot convert 'ujis' character 0x8FB0F0 to 'sjis'
-Warning	1976	Cannot convert 'ujis' character 0x8FEDA1 to 'sjis'
-Warning	1976	Cannot convert 'ujis' character 0x8FEDB4 to 'sjis'
-Warning	1976	Cannot convert 'ujis' character 0x8FEDC8 to 'sjis'
-Warning	1976	Cannot convert 'ujis' character 0x8FEDDC to 'sjis'
+Warning	1977	Cannot convert 'ujis' character 0x8FA2AF to 'sjis'
+Warning	1977	Cannot convert 'ujis' character 0x8FA2B5 to 'sjis'
+Warning	1977	Cannot convert 'ujis' character 0x8FA2EB to 'sjis'
+Warning	1977	Cannot convert 'ujis' character 0x8FA2F0 to 'sjis'
+Warning	1977	Cannot convert 'ujis' character 0x8FA6E1 to 'sjis'
+Warning	1977	Cannot convert 'ujis' character 0x8FA6F1 to 'sjis'
+Warning	1977	Cannot convert 'ujis' character 0x8FA7C2 to 'sjis'
+Warning	1977	Cannot convert 'ujis' character 0x8FA7C8 to 'sjis'
+Warning	1977	Cannot convert 'ujis' character 0x8FA7F2 to 'sjis'
+Warning	1977	Cannot convert 'ujis' character 0x8FA9A1 to 'sjis'
+Warning	1977	Cannot convert 'ujis' character 0x8FA9C1 to 'sjis'
+Warning	1977	Cannot convert 'ujis' character 0x8FA9C8 to 'sjis'
+Warning	1977	Cannot convert 'ujis' character 0x8FAAA1 to 'sjis'
+Warning	1977	Cannot convert 'ujis' character 0x8FAAB4 to 'sjis'
+Warning	1977	Cannot convert 'ujis' character 0x8FAAC8 to 'sjis'
+Warning	1977	Cannot convert 'ujis' character 0x8FAADC to 'sjis'
+Warning	1977	Cannot convert 'ujis' character 0x8FAAF0 to 'sjis'
+Warning	1977	Cannot convert 'ujis' character 0x8FABA1 to 'sjis'
+Warning	1977	Cannot convert 'ujis' character 0x8FABB4 to 'sjis'
+Warning	1977	Cannot convert 'ujis' character 0x8FABC8 to 'sjis'
+Warning	1977	Cannot convert 'ujis' character 0x8FABDC to 'sjis'
+Warning	1977	Cannot convert 'ujis' character 0x8FABF0 to 'sjis'
+Warning	1977	Cannot convert 'ujis' character 0x8FB0A1 to 'sjis'
+Warning	1977	Cannot convert 'ujis' character 0x8FB0B4 to 'sjis'
+Warning	1977	Cannot convert 'ujis' character 0x8FB0C8 to 'sjis'
+Warning	1977	Cannot convert 'ujis' character 0x8FB0DC to 'sjis'
+Warning	1977	Cannot convert 'ujis' character 0x8FB0F0 to 'sjis'
+Warning	1977	Cannot convert 'ujis' character 0x8FEDA1 to 'sjis'
+Warning	1977	Cannot convert 'ujis' character 0x8FEDB4 to 'sjis'
+Warning	1977	Cannot convert 'ujis' character 0x8FEDC8 to 'sjis'
+Warning	1977	Cannot convert 'ujis' character 0x8FEDDC to 'sjis'
 drop table `T1`;
 drop table `T2`;
 drop table `T3`;
diff --git a/mysql-test/suite/jp/r/jp_convert_utf8.result b/mysql-test/suite/jp/r/jp_convert_utf8.result
index 3528493518f7924bd3e590890c10c6905bcb0f15..e33edfb1c3fda89f59f05bbf130b6de7886a88a7 100644
--- a/mysql-test/suite/jp/r/jp_convert_utf8.result
+++ b/mysql-test/suite/jp/r/jp_convert_utf8.result
@@ -132,7 +132,7 @@ SELECT `锛o紤`, CONVERT(`锛o紤` using ujis) FROM `锛达紥`;
 锛缉锛极锛辑锛集锛帮急锛诧汲锛达嫉锛讹挤锛革脊锛恒兓	锛缉锛极锛辑锛集锛帮急锛诧汲锛达嫉锛讹挤锛革脊锛恒兓
 锝愶綉锝掞綋锝旓綍锝栵綏锝橈綑锝氥兓銉汇兓銉汇兓銉汇兓銉汇兓	锝愶綉锝掞綋锝旓綍锝栵綏锝橈綑锝氥兓銉汇兓銉汇兓銉汇兓銉汇兓
 Warnings:
-Warning	1976	Cannot convert 'utf8' character 0xEFBCBC to 'ujis'
+Warning	1977	Cannot convert 'utf8' character 0xEFBCBC to 'ujis'
 SELECT `锛o紤`, CONVERT(`锛o紤` using ucs2) FROM `锛达紥`;
 锛o紤	CONVERT(`锛o紤` using ucs2)
 胃喂魏位渭谓尉慰蟺蟻蟽蟿蠀蠁蠂蠄蠅銉汇兓銉�	胃喂魏位渭谓尉慰蟺蟻蟽蟿蠀蠁蠂蠄蠅銉汇兓銉�
@@ -270,7 +270,7 @@ SELECT `锛o紤`, CONVERT(`锛o紤` using sjis) FROM `锛达紥`;
 锛缉锛极锛辑锛集锛帮急锛诧汲锛达嫉锛讹挤锛革脊锛恒兓	锛缉锛极锛辑锛集锛帮急锛诧汲锛达嫉锛讹挤锛革脊锛恒兓
 锝愶綉锝掞綋锝旓綍锝栵綏锝橈綑锝氥兓銉汇兓銉汇兓銉汇兓銉汇兓	锝愶綉锝掞綋锝旓綍锝栵綏锝橈綑锝氥兓銉汇兓銉汇兓銉汇兓銉汇兓
 Warnings:
-Warning	1976	Cannot convert 'utf8' character 0xEFBCBC to 'sjis'
+Warning	1977	Cannot convert 'utf8' character 0xEFBCBC to 'sjis'
 SELECT `锛o紤`, CONVERT(`锛o紤` using ujis) FROM `锛达紦`;
 锛o紤	CONVERT(`锛o紤` using ujis)
 锚臎臈膿臋堑臐臒銉荒∧ッ愩兓墨寞末	锚臎臈膿臋堑臐臒銉荒∧ッ愩兓墨寞末
@@ -314,7 +314,7 @@ SELECT `锛o紤`, CONVERT(`锛o紤` using ujis) FROM `锛达紦`;
 榻楅綐榻氶綕榻為建榻╅江榻蒋榻伴奖榻抽降榻洪浇榫忛緪榫戦緬	榻楅綐榻氶綕榻為建榻╅江榻蒋榻伴奖榻抽降榻洪浇榫忛緪榫戦緬
 榫旈緰榫楅緸榫¢劲榫i茎銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓	榫旈緰榫楅緸榫¢劲榫i茎銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓
 Warnings:
-Warning	1976	Cannot convert 'utf8' character 0xEFBD9E to 'ujis'
+Warning	1977	Cannot convert 'utf8' character 0xEFBD9E to 'ujis'
 SELECT `锛o紤`, CONVERT(`锛o紤` using ucs2) FROM `锛达紦`;
 锛o紤	CONVERT(`锛o紤` using ucs2)
 锚臎臈膿臋堑臐臒銉荒∧ッ愩兓墨寞末	锚臎臈膿臋堑臐臒銉荒∧ッ愩兓墨寞末
@@ -400,37 +400,37 @@ SELECT `锛o紤`, CONVERT(`锛o紤` using sjis) FROM `锛达紦`;
 榻楅綐榻氶綕榻為建榻╅江榻蒋榻伴奖榻抽降榻洪浇榫忛緪榫戦緬	????????????????????
 榫旈緰榫楅緸榫¢劲榫i茎銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓	????????銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓
 Warnings:
-Warning	1976	Cannot convert 'utf8' character 0xC3AA to 'sjis'
-Warning	1976	Cannot convert 'utf8' character 0xC38A to 'sjis'
-Warning	1976	Cannot convert 'utf8' character 0xC4B4 to 'sjis'
-Warning	1976	Cannot convert 'utf8' character 0xC4B5 to 'sjis'
-Warning	1976	Cannot convert 'utf8' character 0xC59A to 'sjis'
-Warning	1976	Cannot convert 'utf8' character 0xC59B to 'sjis'
-Warning	1976	Cannot convert 'utf8' character 0xC795 to 'sjis'
-Warning	1976	Cannot convert 'utf8' character 0xC796 to 'sjis'
-Warning	1976	Cannot convert 'utf8' character 0xC2A4 to 'sjis'
-Warning	1976	Cannot convert 'utf8' character 0xC582 to 'sjis'
-Warning	1976	Cannot convert 'utf8' character 0xD088 to 'sjis'
-Warning	1976	Cannot convert 'utf8' character 0xC381 to 'sjis'
-Warning	1976	Cannot convert 'utf8' character 0xC3A1 to 'sjis'
-Warning	1976	Cannot convert 'utf8' character 0xC386 to 'sjis'
-Warning	1976	Cannot convert 'utf8' character 0xCB9B to 'sjis'
-Warning	1976	Cannot convert 'utf8' character 0xCEAC to 'sjis'
-Warning	1976	Cannot convert 'utf8' character 0xD192 to 'sjis'
-Warning	1976	Cannot convert 'utf8' character 0xCE86 to 'sjis'
-Warning	1976	Cannot convert 'utf8' character 0xC3A6 to 'sjis'
-Warning	1976	Cannot convert 'utf8' character 0xD082 to 'sjis'
-Warning	1976	Cannot convert 'utf8' character 0xC2BA to 'sjis'
-Warning	1976	Cannot convert 'utf8' character 0xCB98 to 'sjis'
-Warning	1976	Cannot convert 'utf8' character 0xE4B882 to 'sjis'
-Warning	1976	Cannot convert 'utf8' character 0xE9BBB8 to 'sjis'
-Warning	1976	Cannot convert 'utf8' character 0xE4B99A to 'sjis'
-Warning	1976	Cannot convert 'utf8' character 0xE4BBA1 to 'sjis'
-Warning	1976	Cannot convert 'utf8' character 0xE4BC99 to 'sjis'
-Warning	1976	Cannot convert 'utf8' character 0xE4BD9F to 'sjis'
-Warning	1976	Cannot convert 'utf8' character 0xE9BCAB to 'sjis'
-Warning	1976	Cannot convert 'utf8' character 0xE9BD97 to 'sjis'
-Warning	1976	Cannot convert 'utf8' character 0xE9BE94 to 'sjis'
+Warning	1977	Cannot convert 'utf8' character 0xC3AA to 'sjis'
+Warning	1977	Cannot convert 'utf8' character 0xC38A to 'sjis'
+Warning	1977	Cannot convert 'utf8' character 0xC4B4 to 'sjis'
+Warning	1977	Cannot convert 'utf8' character 0xC4B5 to 'sjis'
+Warning	1977	Cannot convert 'utf8' character 0xC59A to 'sjis'
+Warning	1977	Cannot convert 'utf8' character 0xC59B to 'sjis'
+Warning	1977	Cannot convert 'utf8' character 0xC795 to 'sjis'
+Warning	1977	Cannot convert 'utf8' character 0xC796 to 'sjis'
+Warning	1977	Cannot convert 'utf8' character 0xC2A4 to 'sjis'
+Warning	1977	Cannot convert 'utf8' character 0xC582 to 'sjis'
+Warning	1977	Cannot convert 'utf8' character 0xD088 to 'sjis'
+Warning	1977	Cannot convert 'utf8' character 0xC381 to 'sjis'
+Warning	1977	Cannot convert 'utf8' character 0xC3A1 to 'sjis'
+Warning	1977	Cannot convert 'utf8' character 0xC386 to 'sjis'
+Warning	1977	Cannot convert 'utf8' character 0xCB9B to 'sjis'
+Warning	1977	Cannot convert 'utf8' character 0xCEAC to 'sjis'
+Warning	1977	Cannot convert 'utf8' character 0xD192 to 'sjis'
+Warning	1977	Cannot convert 'utf8' character 0xCE86 to 'sjis'
+Warning	1977	Cannot convert 'utf8' character 0xC3A6 to 'sjis'
+Warning	1977	Cannot convert 'utf8' character 0xD082 to 'sjis'
+Warning	1977	Cannot convert 'utf8' character 0xC2BA to 'sjis'
+Warning	1977	Cannot convert 'utf8' character 0xCB98 to 'sjis'
+Warning	1977	Cannot convert 'utf8' character 0xE4B882 to 'sjis'
+Warning	1977	Cannot convert 'utf8' character 0xE9BBB8 to 'sjis'
+Warning	1977	Cannot convert 'utf8' character 0xE4B99A to 'sjis'
+Warning	1977	Cannot convert 'utf8' character 0xE4BBA1 to 'sjis'
+Warning	1977	Cannot convert 'utf8' character 0xE4BC99 to 'sjis'
+Warning	1977	Cannot convert 'utf8' character 0xE4BD9F to 'sjis'
+Warning	1977	Cannot convert 'utf8' character 0xE9BCAB to 'sjis'
+Warning	1977	Cannot convert 'utf8' character 0xE9BD97 to 'sjis'
+Warning	1977	Cannot convert 'utf8' character 0xE9BE94 to 'sjis'
 SELECT `锛o紤`, CONVERT(`锛o紤` using ujis) FROM `锛达紨`;
 锛o紤	CONVERT(`锛o紤` using ujis)
  !"#$%&'()*+,-./	 !"#$%&'()*+,-./
@@ -536,7 +536,7 @@ SELECT `锛o紤`, CONVERT(`锛o紤` using ujis) FROM `锛达紩`;
 锛缉锛极锛辑锛集锛帮急锛诧汲锛达嫉锛讹挤锛革脊锛恒兓	锛缉锛极锛辑锛集锛帮急锛诧汲锛达嫉锛讹挤锛革脊锛恒兓
 锝愶綉锝掞綋锝旓綍锝栵綏锝橈綑锝氥兓銉汇兓銉汇兓銉汇兓銉汇兓	锝愶綉锝掞綋锝旓綍锝栵綏锝橈綑锝氥兓銉汇兓銉汇兓銉汇兓銉汇兓
 Warnings:
-Warning	1976	Cannot convert 'utf8' character 0xEFBCBC to 'ujis'
+Warning	1977	Cannot convert 'utf8' character 0xEFBCBC to 'ujis'
 SELECT `锛o紤`, CONVERT(`锛o紤` using ucs2) FROM `锛达紩`;
 锛o紤	CONVERT(`锛o紤` using ucs2)
 胃喂魏位渭谓尉慰蟺蟻蟽蟿蠀蠁蠂蠄蠅銉汇兓銉�	胃喂魏位渭谓尉慰蟺蟻蟽蟿蠀蠁蠂蠄蠅銉汇兓銉�
@@ -674,7 +674,7 @@ SELECT `锛o紤`, CONVERT(`锛o紤` using sjis) FROM `锛达紩`;
 锛缉锛极锛辑锛集锛帮急锛诧汲锛达嫉锛讹挤锛革脊锛恒兓	锛缉锛极锛辑锛集锛帮急锛诧汲锛达嫉锛讹挤锛革脊锛恒兓
 锝愶綉锝掞綋锝旓綍锝栵綏锝橈綑锝氥兓銉汇兓銉汇兓銉汇兓銉汇兓	锝愶綉锝掞綋锝旓綍锝栵綏锝橈綑锝氥兓銉汇兓銉汇兓銉汇兓銉汇兓
 Warnings:
-Warning	1976	Cannot convert 'utf8' character 0xEFBCBC to 'sjis'
+Warning	1977	Cannot convert 'utf8' character 0xEFBCBC to 'sjis'
 SELECT `锛o紤`, CONVERT(`锛o紤` using ujis) FROM `锛达紪`;
 锛o紤	CONVERT(`锛o紤` using ujis)
 锚臎臈膿臋堑臐臒銉荒∧ッ愩兓墨寞末	锚臎臈膿臋堑臐臒銉荒∧ッ愩兓墨寞末
@@ -718,7 +718,7 @@ SELECT `锛o紤`, CONVERT(`锛o紤` using ujis) FROM `锛达紪`;
 榻楅綐榻氶綕榻為建榻╅江榻蒋榻伴奖榻抽降榻洪浇榫忛緪榫戦緬	榻楅綐榻氶綕榻為建榻╅江榻蒋榻伴奖榻抽降榻洪浇榫忛緪榫戦緬
 榫旈緰榫楅緸榫¢劲榫i茎銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓	榫旈緰榫楅緸榫¢劲榫i茎銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓
 Warnings:
-Warning	1976	Cannot convert 'utf8' character 0xEFBD9E to 'ujis'
+Warning	1977	Cannot convert 'utf8' character 0xEFBD9E to 'ujis'
 SELECT `锛o紤`, CONVERT(`锛o紤` using ucs2) FROM `锛达紪`;
 锛o紤	CONVERT(`锛o紤` using ucs2)
 锚臎臈膿臋堑臐臒銉荒∧ッ愩兓墨寞末	锚臎臈膿臋堑臐臒銉荒∧ッ愩兓墨寞末
@@ -804,37 +804,37 @@ SELECT `锛o紤`, CONVERT(`锛o紤` using sjis) FROM `锛达紪`;
 榻楅綐榻氶綕榻為建榻╅江榻蒋榻伴奖榻抽降榻洪浇榫忛緪榫戦緬	????????????????????
 榫旈緰榫楅緸榫¢劲榫i茎銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓	????????銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓
 Warnings:
-Warning	1976	Cannot convert 'utf8' character 0xC3AA to 'sjis'
-Warning	1976	Cannot convert 'utf8' character 0xC38A to 'sjis'
-Warning	1976	Cannot convert 'utf8' character 0xC4B4 to 'sjis'
-Warning	1976	Cannot convert 'utf8' character 0xC4B5 to 'sjis'
-Warning	1976	Cannot convert 'utf8' character 0xC59A to 'sjis'
-Warning	1976	Cannot convert 'utf8' character 0xC59B to 'sjis'
-Warning	1976	Cannot convert 'utf8' character 0xC795 to 'sjis'
-Warning	1976	Cannot convert 'utf8' character 0xC796 to 'sjis'
-Warning	1976	Cannot convert 'utf8' character 0xC2A4 to 'sjis'
-Warning	1976	Cannot convert 'utf8' character 0xC582 to 'sjis'
-Warning	1976	Cannot convert 'utf8' character 0xD088 to 'sjis'
-Warning	1976	Cannot convert 'utf8' character 0xC381 to 'sjis'
-Warning	1976	Cannot convert 'utf8' character 0xC3A1 to 'sjis'
-Warning	1976	Cannot convert 'utf8' character 0xC386 to 'sjis'
-Warning	1976	Cannot convert 'utf8' character 0xCB9B to 'sjis'
-Warning	1976	Cannot convert 'utf8' character 0xCEAC to 'sjis'
-Warning	1976	Cannot convert 'utf8' character 0xD192 to 'sjis'
-Warning	1976	Cannot convert 'utf8' character 0xCE86 to 'sjis'
-Warning	1976	Cannot convert 'utf8' character 0xC3A6 to 'sjis'
-Warning	1976	Cannot convert 'utf8' character 0xD082 to 'sjis'
-Warning	1976	Cannot convert 'utf8' character 0xC2BA to 'sjis'
-Warning	1976	Cannot convert 'utf8' character 0xCB98 to 'sjis'
-Warning	1976	Cannot convert 'utf8' character 0xE4B882 to 'sjis'
-Warning	1976	Cannot convert 'utf8' character 0xE9BBB8 to 'sjis'
-Warning	1976	Cannot convert 'utf8' character 0xE4B99A to 'sjis'
-Warning	1976	Cannot convert 'utf8' character 0xE4BBA1 to 'sjis'
-Warning	1976	Cannot convert 'utf8' character 0xE4BC99 to 'sjis'
-Warning	1976	Cannot convert 'utf8' character 0xE4BD9F to 'sjis'
-Warning	1976	Cannot convert 'utf8' character 0xE9BCAB to 'sjis'
-Warning	1976	Cannot convert 'utf8' character 0xE9BD97 to 'sjis'
-Warning	1976	Cannot convert 'utf8' character 0xE9BE94 to 'sjis'
+Warning	1977	Cannot convert 'utf8' character 0xC3AA to 'sjis'
+Warning	1977	Cannot convert 'utf8' character 0xC38A to 'sjis'
+Warning	1977	Cannot convert 'utf8' character 0xC4B4 to 'sjis'
+Warning	1977	Cannot convert 'utf8' character 0xC4B5 to 'sjis'
+Warning	1977	Cannot convert 'utf8' character 0xC59A to 'sjis'
+Warning	1977	Cannot convert 'utf8' character 0xC59B to 'sjis'
+Warning	1977	Cannot convert 'utf8' character 0xC795 to 'sjis'
+Warning	1977	Cannot convert 'utf8' character 0xC796 to 'sjis'
+Warning	1977	Cannot convert 'utf8' character 0xC2A4 to 'sjis'
+Warning	1977	Cannot convert 'utf8' character 0xC582 to 'sjis'
+Warning	1977	Cannot convert 'utf8' character 0xD088 to 'sjis'
+Warning	1977	Cannot convert 'utf8' character 0xC381 to 'sjis'
+Warning	1977	Cannot convert 'utf8' character 0xC3A1 to 'sjis'
+Warning	1977	Cannot convert 'utf8' character 0xC386 to 'sjis'
+Warning	1977	Cannot convert 'utf8' character 0xCB9B to 'sjis'
+Warning	1977	Cannot convert 'utf8' character 0xCEAC to 'sjis'
+Warning	1977	Cannot convert 'utf8' character 0xD192 to 'sjis'
+Warning	1977	Cannot convert 'utf8' character 0xCE86 to 'sjis'
+Warning	1977	Cannot convert 'utf8' character 0xC3A6 to 'sjis'
+Warning	1977	Cannot convert 'utf8' character 0xD082 to 'sjis'
+Warning	1977	Cannot convert 'utf8' character 0xC2BA to 'sjis'
+Warning	1977	Cannot convert 'utf8' character 0xCB98 to 'sjis'
+Warning	1977	Cannot convert 'utf8' character 0xE4B882 to 'sjis'
+Warning	1977	Cannot convert 'utf8' character 0xE9BBB8 to 'sjis'
+Warning	1977	Cannot convert 'utf8' character 0xE4B99A to 'sjis'
+Warning	1977	Cannot convert 'utf8' character 0xE4BBA1 to 'sjis'
+Warning	1977	Cannot convert 'utf8' character 0xE4BC99 to 'sjis'
+Warning	1977	Cannot convert 'utf8' character 0xE4BD9F to 'sjis'
+Warning	1977	Cannot convert 'utf8' character 0xE9BCAB to 'sjis'
+Warning	1977	Cannot convert 'utf8' character 0xE9BD97 to 'sjis'
+Warning	1977	Cannot convert 'utf8' character 0xE9BE94 to 'sjis'
 SELECT `锛o紤`, CONVERT(`锛o紤` using ujis) FROM `锛达紬`;
 锛o紤	CONVERT(`锛o紤` using ujis)
  !"#$%&'()*+,-./	 !"#$%&'()*+,-./
@@ -940,7 +940,7 @@ SELECT `锛o紤`, CONVERT(`锛o紤` using ujis) FROM `锛达紭`;
 銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓	銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓
 銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓	銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓
 Warnings:
-Warning	1976	Cannot convert 'utf8' character 0xEFBCBC to 'ujis'
+Warning	1977	Cannot convert 'utf8' character 0xEFBCBC to 'ujis'
 SELECT `锛o紤`, CONVERT(`锛o紤` using ucs2) FROM `锛达紭`;
 锛o紤	CONVERT(`锛o紤` using ucs2)
 銆€銆€銆併€傦紝锛庛兓锛氾紱锛燂紒銈涖倻麓锝€篓锛撅浚锛裤兘	銆€銆€銆併€傦紝锛庛兓锛氾紱锛燂紒銈涖倻麓锝€篓锛撅浚锛裤兘
@@ -1078,7 +1078,7 @@ SELECT `锛o紤`, CONVERT(`锛o紤` using sjis) FROM `锛达紭`;
 銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓	銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓
 銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓	銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓
 Warnings:
-Warning	1976	Cannot convert 'utf8' character 0xEFBCBC to 'sjis'
+Warning	1977	Cannot convert 'utf8' character 0xEFBCBC to 'sjis'
 SELECT `锛o紤`, CONVERT(`锛o紤` using ujis) FROM `锛达紮`;
 锛o紤	CONVERT(`锛o紤` using ujis)
 銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉凰標嚶杆櫵�	銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉凰標嚶杆櫵�
@@ -1122,7 +1122,7 @@ SELECT `锛o紤`, CONVERT(`锛o紤` using ujis) FROM `锛达紮`;
 榫旈緰榫楅緸榫¢劲榫i茎銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓	榫旈緰榫楅緸榫¢劲榫i茎銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓
 銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓	銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓
 Warnings:
-Warning	1976	Cannot convert 'utf8' character 0xEFBD9E to 'ujis'
+Warning	1977	Cannot convert 'utf8' character 0xEFBD9E to 'ujis'
 SELECT `锛o紤`, CONVERT(`锛o紤` using ucs2) FROM `锛达紮`;
 锛o紤	CONVERT(`锛o紤` using ucs2)
 銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉凰標嚶杆櫵�	銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉凰標嚶杆櫵�
@@ -1208,37 +1208,37 @@ SELECT `锛o紤`, CONVERT(`锛o紤` using sjis) FROM `锛达紮`;
 榫旈緰榫楅緸榫¢劲榫i茎銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓	????????銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓
 銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓	銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓銉汇兓
 Warnings:
-Warning	1976	Cannot convert 'utf8' character 0xCB98 to 'sjis'
-Warning	1976	Cannot convert 'utf8' character 0xCB9B to 'sjis'
-Warning	1976	Cannot convert 'utf8' character 0xC2BA to 'sjis'
-Warning	1976	Cannot convert 'utf8' character 0xC2A4 to 'sjis'
-Warning	1976	Cannot convert 'utf8' character 0xCE86 to 'sjis'
-Warning	1976	Cannot convert 'utf8' character 0xCEAC to 'sjis'
-Warning	1976	Cannot convert 'utf8' character 0xD082 to 'sjis'
-Warning	1976	Cannot convert 'utf8' character 0xD088 to 'sjis'
-Warning	1976	Cannot convert 'utf8' character 0xD192 to 'sjis'
-Warning	1976	Cannot convert 'utf8' character 0xC386 to 'sjis'
-Warning	1976	Cannot convert 'utf8' character 0xC3A6 to 'sjis'
-Warning	1976	Cannot convert 'utf8' character 0xC582 to 'sjis'
-Warning	1976	Cannot convert 'utf8' character 0xC381 to 'sjis'
-Warning	1976	Cannot convert 'utf8' character 0xC38A to 'sjis'
-Warning	1976	Cannot convert 'utf8' character 0xC4B4 to 'sjis'
-Warning	1976	Cannot convert 'utf8' character 0xC59A to 'sjis'
-Warning	1976	Cannot convert 'utf8' character 0xC795 to 'sjis'
-Warning	1976	Cannot convert 'utf8' character 0xC3A1 to 'sjis'
-Warning	1976	Cannot convert 'utf8' character 0xC3AA to 'sjis'
-Warning	1976	Cannot convert 'utf8' character 0xC4B5 to 'sjis'
-Warning	1976	Cannot convert 'utf8' character 0xC59B to 'sjis'
-Warning	1976	Cannot convert 'utf8' character 0xC796 to 'sjis'
-Warning	1976	Cannot convert 'utf8' character 0xE4B882 to 'sjis'
-Warning	1976	Cannot convert 'utf8' character 0xE4B99A to 'sjis'
-Warning	1976	Cannot convert 'utf8' character 0xE4BBA1 to 'sjis'
-Warning	1976	Cannot convert 'utf8' character 0xE4BC99 to 'sjis'
-Warning	1976	Cannot convert 'utf8' character 0xE4BD9F to 'sjis'
-Warning	1976	Cannot convert 'utf8' character 0xE9BBB8 to 'sjis'
-Warning	1976	Cannot convert 'utf8' character 0xE9BCAB to 'sjis'
-Warning	1976	Cannot convert 'utf8' character 0xE9BD97 to 'sjis'
-Warning	1976	Cannot convert 'utf8' character 0xE9BE94 to 'sjis'
+Warning	1977	Cannot convert 'utf8' character 0xCB98 to 'sjis'
+Warning	1977	Cannot convert 'utf8' character 0xCB9B to 'sjis'
+Warning	1977	Cannot convert 'utf8' character 0xC2BA to 'sjis'
+Warning	1977	Cannot convert 'utf8' character 0xC2A4 to 'sjis'
+Warning	1977	Cannot convert 'utf8' character 0xCE86 to 'sjis'
+Warning	1977	Cannot convert 'utf8' character 0xCEAC to 'sjis'
+Warning	1977	Cannot convert 'utf8' character 0xD082 to 'sjis'
+Warning	1977	Cannot convert 'utf8' character 0xD088 to 'sjis'
+Warning	1977	Cannot convert 'utf8' character 0xD192 to 'sjis'
+Warning	1977	Cannot convert 'utf8' character 0xC386 to 'sjis'
+Warning	1977	Cannot convert 'utf8' character 0xC3A6 to 'sjis'
+Warning	1977	Cannot convert 'utf8' character 0xC582 to 'sjis'
+Warning	1977	Cannot convert 'utf8' character 0xC381 to 'sjis'
+Warning	1977	Cannot convert 'utf8' character 0xC38A to 'sjis'
+Warning	1977	Cannot convert 'utf8' character 0xC4B4 to 'sjis'
+Warning	1977	Cannot convert 'utf8' character 0xC59A to 'sjis'
+Warning	1977	Cannot convert 'utf8' character 0xC795 to 'sjis'
+Warning	1977	Cannot convert 'utf8' character 0xC3A1 to 'sjis'
+Warning	1977	Cannot convert 'utf8' character 0xC3AA to 'sjis'
+Warning	1977	Cannot convert 'utf8' character 0xC4B5 to 'sjis'
+Warning	1977	Cannot convert 'utf8' character 0xC59B to 'sjis'
+Warning	1977	Cannot convert 'utf8' character 0xC796 to 'sjis'
+Warning	1977	Cannot convert 'utf8' character 0xE4B882 to 'sjis'
+Warning	1977	Cannot convert 'utf8' character 0xE4B99A to 'sjis'
+Warning	1977	Cannot convert 'utf8' character 0xE4BBA1 to 'sjis'
+Warning	1977	Cannot convert 'utf8' character 0xE4BC99 to 'sjis'
+Warning	1977	Cannot convert 'utf8' character 0xE4BD9F to 'sjis'
+Warning	1977	Cannot convert 'utf8' character 0xE9BBB8 to 'sjis'
+Warning	1977	Cannot convert 'utf8' character 0xE9BCAB to 'sjis'
+Warning	1977	Cannot convert 'utf8' character 0xE9BD97 to 'sjis'
+Warning	1977	Cannot convert 'utf8' character 0xE9BE94 to 'sjis'
 drop table `锛达紤`;
 drop table `锛达紥`;
 drop table `锛达紦`;
diff --git a/mysql-test/suite/sys_vars/r/sysvars_innodb.result b/mysql-test/suite/sys_vars/r/sysvars_innodb.result
index e3531cc0edcb756e69f39b2d3bb7188c4371da0a..1d7d52239ba0842ee9316a9b7878e32947961cf4 100644
--- a/mysql-test/suite/sys_vars/r/sysvars_innodb.result
+++ b/mysql-test/suite/sys_vars/r/sysvars_innodb.result
@@ -1617,7 +1617,7 @@ READ_ONLY	NO
 COMMAND_LINE_ARGUMENT	REQUIRED
 VARIABLE_NAME	INNODB_OPEN_FILES
 SESSION_VALUE	NULL
-GLOBAL_VALUE	400
+GLOBAL_VALUE	2000
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	0
 VARIABLE_SCOPE	GLOBAL
diff --git a/mysql-test/suite/sys_vars/r/sysvars_server_embedded,32bit.rdiff b/mysql-test/suite/sys_vars/r/sysvars_server_embedded,32bit.rdiff
index 215ec21e715b8992f2d6fe6d1ad15996d018e468..170989d9fa05f4c2e4b20de74dd6c4c133998de4 100644
--- a/mysql-test/suite/sys_vars/r/sysvars_server_embedded,32bit.rdiff
+++ b/mysql-test/suite/sys_vars/r/sysvars_server_embedded,32bit.rdiff
@@ -1,5 +1,5 @@
---- suite/sys_vars/r/sysvars_server_embedded.result
-+++ suite/sys_vars/r/sysvars_server_embedded,32bit.reject
+--- suite/sys_vars/r/sysvars_server_embedded.result	2015-09-04 13:17:44.407031503 +0000
++++ suite/sys_vars/r/sysvars_server_embedded,32bit.reject	2015-09-04 13:39:45.098389360 +0000
 @@ -57,7 +57,7 @@
  GLOBAL_VALUE_ORIGIN	CONFIG
  DEFAULT_VALUE	1
@@ -19,13 +19,13 @@
  NUMERIC_MIN_VALUE	1
  NUMERIC_MAX_VALUE	65535
 @@ -85,7 +85,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
+ GLOBAL_VALUE_ORIGIN	AUTO
  DEFAULT_VALUE	150
  VARIABLE_SCOPE	GLOBAL
 -VARIABLE_TYPE	BIGINT UNSIGNED
 +VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	The number of outstanding connection requests MySQL can have. This comes into play when the main MySQL thread gets very many connection requests in a very short time
- NUMERIC_MIN_VALUE	1
+ VARIABLE_COMMENT	The number of outstanding connection requests MariaDB can have. This comes into play when the main MySQL thread gets very many connection requests in a very short time
+ NUMERIC_MIN_VALUE	0
  NUMERIC_MAX_VALUE	65535
 @@ -144,7 +144,7 @@
  VARIABLE_TYPE	BIGINT UNSIGNED
@@ -170,7 +170,7 @@
  VARIABLE_COMMENT	Precision of the result of '/' operator will be increased on that value
  NUMERIC_MIN_VALUE	0
  NUMERIC_MAX_VALUE	30
-@@ -771,7 +771,7 @@
+@@ -785,7 +785,7 @@
  GLOBAL_VALUE_ORIGIN	COMPILE-TIME
  DEFAULT_VALUE	0
  VARIABLE_SCOPE	GLOBAL
@@ -179,7 +179,7 @@
  VARIABLE_COMMENT	If non-zero, binary logs will be purged after expire_logs_days days; possible purges happen at startup and at binary log rotation
  NUMERIC_MIN_VALUE	0
  NUMERIC_MAX_VALUE	99
-@@ -799,7 +799,7 @@
+@@ -813,7 +813,7 @@
  GLOBAL_VALUE_ORIGIN	COMPILE-TIME
  DEFAULT_VALUE	1
  VARIABLE_SCOPE	GLOBAL
@@ -188,7 +188,7 @@
  VARIABLE_COMMENT	The number of connections on extra-port
  NUMERIC_MIN_VALUE	1
  NUMERIC_MAX_VALUE	100000
-@@ -841,7 +841,7 @@
+@@ -855,7 +855,7 @@
  GLOBAL_VALUE_ORIGIN	COMPILE-TIME
  DEFAULT_VALUE	0
  VARIABLE_SCOPE	GLOBAL
@@ -197,7 +197,7 @@
  VARIABLE_COMMENT	A dedicated thread is created to flush all tables at the given interval
  NUMERIC_MIN_VALUE	0
  NUMERIC_MAX_VALUE	31536000
-@@ -883,7 +883,7 @@
+@@ -897,7 +897,7 @@
  GLOBAL_VALUE_ORIGIN	COMPILE-TIME
  DEFAULT_VALUE	84
  VARIABLE_SCOPE	GLOBAL
@@ -206,7 +206,7 @@
  VARIABLE_COMMENT	The maximum length of the word to be included in a FULLTEXT index. Note: FULLTEXT indexes must be rebuilt after changing this variable
  NUMERIC_MIN_VALUE	10
  NUMERIC_MAX_VALUE	84
-@@ -897,7 +897,7 @@
+@@ -911,7 +911,7 @@
  GLOBAL_VALUE_ORIGIN	COMPILE-TIME
  DEFAULT_VALUE	4
  VARIABLE_SCOPE	GLOBAL
@@ -215,7 +215,7 @@
  VARIABLE_COMMENT	The minimum length of the word to be included in a FULLTEXT index. Note: FULLTEXT indexes must be rebuilt after changing this variable
  NUMERIC_MIN_VALUE	1
  NUMERIC_MAX_VALUE	84
-@@ -911,7 +911,7 @@
+@@ -925,7 +925,7 @@
  GLOBAL_VALUE_ORIGIN	COMPILE-TIME
  DEFAULT_VALUE	20
  VARIABLE_SCOPE	GLOBAL
@@ -224,7 +224,7 @@
  VARIABLE_COMMENT	Number of best matches to use for query expansion
  NUMERIC_MIN_VALUE	0
  NUMERIC_MAX_VALUE	1000
-@@ -970,7 +970,7 @@
+@@ -984,7 +984,7 @@
  VARIABLE_TYPE	BIGINT UNSIGNED
  VARIABLE_COMMENT	The maximum length of the result of function  GROUP_CONCAT()
  NUMERIC_MIN_VALUE	4
@@ -233,7 +233,7 @@
  NUMERIC_BLOCK_SIZE	1
  ENUM_VALUE_LIST	NULL
  READ_ONLY	NO
-@@ -1121,7 +1121,7 @@
+@@ -1135,7 +1135,7 @@
  GLOBAL_VALUE_ORIGIN	COMPILE-TIME
  DEFAULT_VALUE	0
  VARIABLE_SCOPE	SESSION
@@ -242,8 +242,8 @@
  VARIABLE_COMMENT	Number of bytes used for a histogram. If set to 0, no histograms are created by ANALYZE.
  NUMERIC_MIN_VALUE	0
  NUMERIC_MAX_VALUE	255
-@@ -1149,7 +1149,7 @@
- GLOBAL_VALUE_ORIGIN	COMPILE-TIME
+@@ -1163,7 +1163,7 @@
+ GLOBAL_VALUE_ORIGIN	AUTO
  DEFAULT_VALUE	128
  VARIABLE_SCOPE	GLOBAL
 -VARIABLE_TYPE	BIGINT UNSIGNED
@@ -251,7 +251,7 @@
  VARIABLE_COMMENT	How many host names should be cached to avoid resolving.
  NUMERIC_MIN_VALUE	0
  NUMERIC_MAX_VALUE	65536
-@@ -1261,7 +1261,7 @@
+@@ -1275,7 +1275,7 @@
  GLOBAL_VALUE_ORIGIN	COMPILE-TIME
  DEFAULT_VALUE	28800
  VARIABLE_SCOPE	SESSION
@@ -260,7 +260,7 @@
  VARIABLE_COMMENT	The number of seconds the server waits for activity on an interactive connection before closing it
  NUMERIC_MIN_VALUE	1
  NUMERIC_MAX_VALUE	31536000
-@@ -1292,7 +1292,7 @@
+@@ -1306,7 +1306,7 @@
  VARIABLE_TYPE	BIGINT UNSIGNED
  VARIABLE_COMMENT	The size of the buffer that is used for joins
  NUMERIC_MIN_VALUE	128
@@ -269,7 +269,7 @@
  NUMERIC_BLOCK_SIZE	128
  ENUM_VALUE_LIST	NULL
  READ_ONLY	NO
-@@ -1317,7 +1317,7 @@
+@@ -1331,7 +1331,7 @@
  GLOBAL_VALUE_ORIGIN	COMPILE-TIME
  DEFAULT_VALUE	2
  VARIABLE_SCOPE	SESSION
@@ -278,7 +278,16 @@
  VARIABLE_COMMENT	Controls what join operations can be executed with join buffers. Odd numbers are used for plain join buffers while even numbers are used for linked buffers
  NUMERIC_MIN_VALUE	0
  NUMERIC_MAX_VALUE	8
-@@ -1555,7 +1555,7 @@
+@@ -1362,7 +1362,7 @@
+ VARIABLE_TYPE	BIGINT UNSIGNED
+ VARIABLE_COMMENT	The size of the buffer used for index blocks for MyISAM tables. Increase this to get better index handling (for all reads and multiple writes) to as much as you can afford
+ NUMERIC_MIN_VALUE	0
+-NUMERIC_MAX_VALUE	18446744073709551615
++NUMERIC_MAX_VALUE	4294967295
+ NUMERIC_BLOCK_SIZE	4096
+ ENUM_VALUE_LIST	NULL
+ READ_ONLY	NO
+@@ -1569,7 +1569,7 @@
  GLOBAL_VALUE_ORIGIN	COMPILE-TIME
  DEFAULT_VALUE	31536000
  VARIABLE_SCOPE	SESSION
@@ -287,7 +296,7 @@
  VARIABLE_COMMENT	Timeout in seconds to wait for a lock before returning an error.
  NUMERIC_MIN_VALUE	1
  NUMERIC_MAX_VALUE	31536000
-@@ -1653,7 +1653,7 @@
+@@ -1667,7 +1667,7 @@
  GLOBAL_VALUE_ORIGIN	COMPILE-TIME
  DEFAULT_VALUE	1
  VARIABLE_SCOPE	SESSION
@@ -296,7 +305,7 @@
  VARIABLE_COMMENT	Write to slow log every #th slow query. Set to 1 to log everything. Increase it to reduce the size of the slow or the performance impact of slow logging
  NUMERIC_MIN_VALUE	1
  NUMERIC_MAX_VALUE	4294967295
-@@ -1681,7 +1681,7 @@
+@@ -1695,7 +1695,7 @@
  GLOBAL_VALUE_ORIGIN	COMPILE-TIME
  DEFAULT_VALUE	1
  VARIABLE_SCOPE	SESSION
@@ -305,16 +314,16 @@
  VARIABLE_COMMENT	Log some not critical warnings to the general log file.Value can be between 0 and 11. Higher values mean more verbosity
  NUMERIC_MIN_VALUE	0
  NUMERIC_MAX_VALUE	4294967295
-@@ -1723,7 +1723,7 @@
+@@ -1737,7 +1737,7 @@
  GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	1048576
+ DEFAULT_VALUE	4194304
  VARIABLE_SCOPE	SESSION
 -VARIABLE_TYPE	BIGINT UNSIGNED
 +VARIABLE_TYPE	INT UNSIGNED
  VARIABLE_COMMENT	Max packet length to send to or receive from the server
  NUMERIC_MIN_VALUE	1024
  NUMERIC_MAX_VALUE	1073741824
-@@ -1733,14 +1733,14 @@
+@@ -1747,14 +1747,14 @@
  COMMAND_LINE_ARGUMENT	REQUIRED
  VARIABLE_NAME	MAX_BINLOG_CACHE_SIZE
  SESSION_VALUE	NULL
@@ -332,7 +341,7 @@
  NUMERIC_BLOCK_SIZE	4096
  ENUM_VALUE_LIST	NULL
  READ_ONLY	NO
-@@ -1751,7 +1751,7 @@
+@@ -1765,7 +1765,7 @@
  GLOBAL_VALUE_ORIGIN	COMPILE-TIME
  DEFAULT_VALUE	1073741824
  VARIABLE_SCOPE	GLOBAL
@@ -341,7 +350,7 @@
  VARIABLE_COMMENT	Binary log will be rotated automatically when the size exceeds this value.
  NUMERIC_MIN_VALUE	4096
  NUMERIC_MAX_VALUE	1073741824
-@@ -1761,14 +1761,14 @@
+@@ -1775,14 +1775,14 @@
  COMMAND_LINE_ARGUMENT	REQUIRED
  VARIABLE_NAME	MAX_BINLOG_STMT_CACHE_SIZE
  SESSION_VALUE	NULL
@@ -359,7 +368,7 @@
  NUMERIC_BLOCK_SIZE	4096
  ENUM_VALUE_LIST	NULL
  READ_ONLY	NO
-@@ -1779,7 +1779,7 @@
+@@ -1793,7 +1793,7 @@
  GLOBAL_VALUE_ORIGIN	COMPILE-TIME
  DEFAULT_VALUE	151
  VARIABLE_SCOPE	GLOBAL
@@ -368,7 +377,7 @@
  VARIABLE_COMMENT	The number of simultaneous clients allowed
  NUMERIC_MIN_VALUE	1
  NUMERIC_MAX_VALUE	100000
-@@ -1793,7 +1793,7 @@
+@@ -1807,7 +1807,7 @@
  GLOBAL_VALUE_ORIGIN	COMPILE-TIME
  DEFAULT_VALUE	100
  VARIABLE_SCOPE	GLOBAL
@@ -377,7 +386,7 @@
  VARIABLE_COMMENT	If there is more than this number of interrupted connections from a host this host will be blocked from further connections
  NUMERIC_MIN_VALUE	1
  NUMERIC_MAX_VALUE	4294967295
-@@ -1807,7 +1807,7 @@
+@@ -1821,7 +1821,7 @@
  GLOBAL_VALUE_ORIGIN	COMPILE-TIME
  DEFAULT_VALUE	20
  VARIABLE_SCOPE	SESSION
@@ -386,7 +395,7 @@
  VARIABLE_COMMENT	Don't start more than this number of threads to handle INSERT DELAYED statements. If set to zero INSERT DELAYED will be not used
  NUMERIC_MIN_VALUE	0
  NUMERIC_MAX_VALUE	16384
-@@ -1835,7 +1835,7 @@
+@@ -1849,7 +1849,7 @@
  GLOBAL_VALUE_ORIGIN	COMPILE-TIME
  DEFAULT_VALUE	64
  VARIABLE_SCOPE	SESSION
@@ -395,7 +404,7 @@
  VARIABLE_COMMENT	Max number of errors/warnings to store for a statement
  NUMERIC_MIN_VALUE	0
  NUMERIC_MAX_VALUE	65535
-@@ -1852,7 +1852,7 @@
+@@ -1866,7 +1866,7 @@
  VARIABLE_TYPE	BIGINT UNSIGNED
  VARIABLE_COMMENT	Don't allow creation of heap tables bigger than this
  NUMERIC_MIN_VALUE	16384
@@ -404,7 +413,7 @@
  NUMERIC_BLOCK_SIZE	1024
  ENUM_VALUE_LIST	NULL
  READ_ONLY	NO
-@@ -1863,7 +1863,7 @@
+@@ -1877,7 +1877,7 @@
  GLOBAL_VALUE_ORIGIN	COMPILE-TIME
  DEFAULT_VALUE	20
  VARIABLE_SCOPE	SESSION
@@ -413,7 +422,7 @@
  VARIABLE_COMMENT	Don't start more than this number of threads to handle INSERT DELAYED statements. If set to zero INSERT DELAYED will be not used
  NUMERIC_MIN_VALUE	0
  NUMERIC_MAX_VALUE	16384
-@@ -1891,7 +1891,7 @@
+@@ -1905,7 +1905,7 @@
  GLOBAL_VALUE_ORIGIN	COMPILE-TIME
  DEFAULT_VALUE	1024
  VARIABLE_SCOPE	SESSION
@@ -422,7 +431,7 @@
  VARIABLE_COMMENT	Max number of bytes in sorted records
  NUMERIC_MIN_VALUE	4
  NUMERIC_MAX_VALUE	8388608
-@@ -1905,7 +1905,7 @@
+@@ -1919,7 +1919,7 @@
  GLOBAL_VALUE_ORIGIN	AUTO
  DEFAULT_VALUE	1048576
  VARIABLE_SCOPE	GLOBAL
@@ -431,7 +440,7 @@
  VARIABLE_COMMENT	The maximum BLOB length to send to server from mysql_send_long_data API. Deprecated option; use max_allowed_packet instead.
  NUMERIC_MIN_VALUE	1024
  NUMERIC_MAX_VALUE	4294967295
-@@ -1919,7 +1919,7 @@
+@@ -1933,7 +1933,7 @@
  GLOBAL_VALUE_ORIGIN	COMPILE-TIME
  DEFAULT_VALUE	16382
  VARIABLE_SCOPE	GLOBAL
@@ -440,7 +449,7 @@
  VARIABLE_COMMENT	Maximum number of prepared statements in the server
  NUMERIC_MIN_VALUE	0
  NUMERIC_MAX_VALUE	1048576
-@@ -1933,7 +1933,7 @@
+@@ -1947,7 +1947,7 @@
  GLOBAL_VALUE_ORIGIN	COMPILE-TIME
  DEFAULT_VALUE	4294967295
  VARIABLE_SCOPE	SESSION
@@ -449,7 +458,7 @@
  VARIABLE_COMMENT	Limit assumed max number of seeks when looking up rows based on a key
  NUMERIC_MIN_VALUE	1
  NUMERIC_MAX_VALUE	4294967295
-@@ -1947,7 +1947,7 @@
+@@ -1961,7 +1961,7 @@
  GLOBAL_VALUE_ORIGIN	COMPILE-TIME
  DEFAULT_VALUE	1024
  VARIABLE_SCOPE	SESSION
@@ -458,7 +467,7 @@
  VARIABLE_COMMENT	The number of bytes to use when sorting BLOB or TEXT values (only the first max_sort_length bytes of each value are used; the rest are ignored)
  NUMERIC_MIN_VALUE	4
  NUMERIC_MAX_VALUE	8388608
-@@ -1961,7 +1961,7 @@
+@@ -1975,7 +1975,7 @@
  GLOBAL_VALUE_ORIGIN	COMPILE-TIME
  DEFAULT_VALUE	0
  VARIABLE_SCOPE	SESSION
@@ -467,7 +476,7 @@
  VARIABLE_COMMENT	Maximum stored procedure recursion depth
  NUMERIC_MIN_VALUE	0
  NUMERIC_MAX_VALUE	255
-@@ -1989,7 +1989,7 @@
+@@ -2003,7 +2003,7 @@
  GLOBAL_VALUE_ORIGIN	COMPILE-TIME
  DEFAULT_VALUE	32
  VARIABLE_SCOPE	SESSION
@@ -476,7 +485,7 @@
  VARIABLE_COMMENT	Unused, will be removed.
  NUMERIC_MIN_VALUE	1
  NUMERIC_MAX_VALUE	4294967295
-@@ -2017,7 +2017,7 @@
+@@ -2031,7 +2031,7 @@
  GLOBAL_VALUE_ORIGIN	COMPILE-TIME
  DEFAULT_VALUE	4294967295
  VARIABLE_SCOPE	GLOBAL
@@ -485,7 +494,7 @@
  VARIABLE_COMMENT	After this many write locks, allow some read locks to run in between
  NUMERIC_MIN_VALUE	1
  NUMERIC_MAX_VALUE	4294967295
-@@ -2031,7 +2031,7 @@
+@@ -2045,7 +2045,7 @@
  GLOBAL_VALUE_ORIGIN	COMPILE-TIME
  DEFAULT_VALUE	1024
  VARIABLE_SCOPE	GLOBAL
@@ -494,7 +503,7 @@
  VARIABLE_COMMENT	Unused
  NUMERIC_MIN_VALUE	1
  NUMERIC_MAX_VALUE	1048576
-@@ -2045,7 +2045,7 @@
+@@ -2059,7 +2059,7 @@
  GLOBAL_VALUE_ORIGIN	COMPILE-TIME
  DEFAULT_VALUE	8
  VARIABLE_SCOPE	GLOBAL
@@ -503,7 +512,7 @@
  VARIABLE_COMMENT	Unused
  NUMERIC_MIN_VALUE	1
  NUMERIC_MAX_VALUE	1024
-@@ -2059,7 +2059,7 @@
+@@ -2073,7 +2073,7 @@
  GLOBAL_VALUE_ORIGIN	COMPILE-TIME
  DEFAULT_VALUE	0
  VARIABLE_SCOPE	SESSION
@@ -512,7 +521,7 @@
  VARIABLE_COMMENT	Don't write queries to slow log that examine fewer rows than that
  NUMERIC_MIN_VALUE	0
  NUMERIC_MAX_VALUE	4294967295
-@@ -2073,7 +2073,7 @@
+@@ -2087,7 +2087,7 @@
  GLOBAL_VALUE_ORIGIN	COMPILE-TIME
  DEFAULT_VALUE	262144
  VARIABLE_SCOPE	SESSION
@@ -521,7 +530,7 @@
  VARIABLE_COMMENT	Size of buffer to use when using MRR with range access
  NUMERIC_MIN_VALUE	8192
  NUMERIC_MAX_VALUE	2147483647
-@@ -2087,10 +2087,10 @@
+@@ -2101,10 +2101,10 @@
  GLOBAL_VALUE_ORIGIN	COMPILE-TIME
  DEFAULT_VALUE	256
  VARIABLE_SCOPE	SESSION
@@ -534,7 +543,7 @@
  NUMERIC_BLOCK_SIZE	1
  ENUM_VALUE_LIST	NULL
  READ_ONLY	NO
-@@ -2101,7 +2101,7 @@
+@@ -2115,7 +2115,7 @@
  GLOBAL_VALUE_ORIGIN	COMPILE-TIME
  DEFAULT_VALUE	1024
  VARIABLE_SCOPE	GLOBAL
@@ -543,7 +552,7 @@
  VARIABLE_COMMENT	Block size to be used for MyISAM index pages
  NUMERIC_MIN_VALUE	1024
  NUMERIC_MAX_VALUE	16384
-@@ -2115,7 +2115,7 @@
+@@ -2129,7 +2129,7 @@
  GLOBAL_VALUE_ORIGIN	COMPILE-TIME
  DEFAULT_VALUE	6
  VARIABLE_SCOPE	GLOBAL
@@ -552,7 +561,7 @@
  VARIABLE_COMMENT	Default pointer size to be used for MyISAM tables
  NUMERIC_MIN_VALUE	2
  NUMERIC_MAX_VALUE	7
-@@ -2125,9 +2125,9 @@
+@@ -2139,9 +2139,9 @@
  COMMAND_LINE_ARGUMENT	REQUIRED
  VARIABLE_NAME	MYISAM_MAX_SORT_FILE_SIZE
  SESSION_VALUE	NULL
@@ -564,7 +573,7 @@
  VARIABLE_SCOPE	GLOBAL
  VARIABLE_TYPE	BIGINT UNSIGNED
  VARIABLE_COMMENT	Don't use the fast sort index method to created index if the temporary file would get bigger than this
-@@ -2139,14 +2139,14 @@
+@@ -2153,14 +2153,14 @@
  COMMAND_LINE_ARGUMENT	REQUIRED
  VARIABLE_NAME	MYISAM_MMAP_SIZE
  SESSION_VALUE	NULL
@@ -582,7 +591,7 @@
  NUMERIC_BLOCK_SIZE	1
  ENUM_VALUE_LIST	NULL
  READ_ONLY	YES
-@@ -2171,10 +2171,10 @@
+@@ -2185,10 +2185,10 @@
  GLOBAL_VALUE_ORIGIN	COMPILE-TIME
  DEFAULT_VALUE	1
  VARIABLE_SCOPE	SESSION
@@ -595,7 +604,7 @@
  NUMERIC_BLOCK_SIZE	1
  ENUM_VALUE_LIST	NULL
  READ_ONLY	NO
-@@ -2188,7 +2188,7 @@
+@@ -2202,7 +2202,7 @@
  VARIABLE_TYPE	BIGINT UNSIGNED
  VARIABLE_COMMENT	The buffer that is allocated when sorting the index when doing a REPAIR or when creating indexes with CREATE INDEX or ALTER TABLE
  NUMERIC_MIN_VALUE	4096
@@ -604,7 +613,7 @@
  NUMERIC_BLOCK_SIZE	1
  ENUM_VALUE_LIST	NULL
  READ_ONLY	NO
-@@ -2241,7 +2241,7 @@
+@@ -2255,7 +2255,7 @@
  GLOBAL_VALUE_ORIGIN	COMPILE-TIME
  DEFAULT_VALUE	16384
  VARIABLE_SCOPE	SESSION
@@ -613,7 +622,7 @@
  VARIABLE_COMMENT	Buffer length for TCP/IP and socket communication
  NUMERIC_MIN_VALUE	1024
  NUMERIC_MAX_VALUE	1048576
-@@ -2255,7 +2255,7 @@
+@@ -2269,7 +2269,7 @@
  GLOBAL_VALUE_ORIGIN	COMPILE-TIME
  DEFAULT_VALUE	30
  VARIABLE_SCOPE	SESSION
@@ -622,7 +631,7 @@
  VARIABLE_COMMENT	Number of seconds to wait for more data from a connection before aborting the read
  NUMERIC_MIN_VALUE	1
  NUMERIC_MAX_VALUE	31536000
-@@ -2269,7 +2269,7 @@
+@@ -2283,7 +2283,7 @@
  GLOBAL_VALUE_ORIGIN	COMPILE-TIME
  DEFAULT_VALUE	10
  VARIABLE_SCOPE	SESSION
@@ -631,7 +640,7 @@
  VARIABLE_COMMENT	If a read on a communication port is interrupted, retry this many times before giving up
  NUMERIC_MIN_VALUE	1
  NUMERIC_MAX_VALUE	4294967295
-@@ -2283,7 +2283,7 @@
+@@ -2297,7 +2297,7 @@
  GLOBAL_VALUE_ORIGIN	COMPILE-TIME
  DEFAULT_VALUE	60
  VARIABLE_SCOPE	SESSION
@@ -640,7 +649,7 @@
  VARIABLE_COMMENT	Number of seconds to wait for a block to be written to a connection before aborting the write
  NUMERIC_MIN_VALUE	1
  NUMERIC_MAX_VALUE	31536000
-@@ -2353,7 +2353,7 @@
+@@ -2367,7 +2367,7 @@
  GLOBAL_VALUE_ORIGIN	COMPILE-TIME
  DEFAULT_VALUE	1
  VARIABLE_SCOPE	SESSION
@@ -649,7 +658,7 @@
  VARIABLE_COMMENT	Controls the heuristic(s) applied during query optimization to prune less-promising partial plans from the optimizer search space. Meaning: 0 - do not apply any heuristic, thus perform exhaustive search; 1 - prune plans based on number of retrieved rows
  NUMERIC_MIN_VALUE	0
  NUMERIC_MAX_VALUE	1
-@@ -2367,7 +2367,7 @@
+@@ -2381,7 +2381,7 @@
  GLOBAL_VALUE_ORIGIN	COMPILE-TIME
  DEFAULT_VALUE	62
  VARIABLE_SCOPE	SESSION
@@ -658,7 +667,7 @@
  VARIABLE_COMMENT	Maximum depth of search performed by the query optimizer. Values larger than the number of relations in a query result in better query plans, but take longer to compile a query. Values smaller than the number of tables in a relation result in faster optimization, but may produce very bad query plans. If set to 0, the system will automatically pick a reasonable value; if set to 63, the optimizer will switch to the original find_best search. NOTE: The value 63 and its associated behaviour is deprecated
  NUMERIC_MIN_VALUE	0
  NUMERIC_MAX_VALUE	63
-@@ -2381,7 +2381,7 @@
+@@ -2395,7 +2395,7 @@
  GLOBAL_VALUE_ORIGIN	COMPILE-TIME
  DEFAULT_VALUE	100
  VARIABLE_SCOPE	SESSION
@@ -667,7 +676,7 @@
  VARIABLE_COMMENT	Controls number of record samples to check condition selectivity
  NUMERIC_MIN_VALUE	10
  NUMERIC_MAX_VALUE	4294967295
-@@ -2409,7 +2409,7 @@
+@@ -2423,7 +2423,7 @@
  GLOBAL_VALUE_ORIGIN	COMPILE-TIME
  DEFAULT_VALUE	1
  VARIABLE_SCOPE	SESSION
@@ -676,7 +685,7 @@
  VARIABLE_COMMENT	Controls selectivity of which conditions the optimizer takes into account to calculate cardinality of a partial join when it searches for the best execution plan Meaning: 1 - use selectivity of index backed range conditions to calculate the cardinality of a partial join if the last joined table is accessed by full table scan or an index scan, 2 - use selectivity of index backed range conditions to calculate the cardinality of a partial join in any case, 3 - additionally always use selectivity of range conditions that are not backed by any index to calculate the cardinality of a partial join, 4 - use histograms to calculate selectivity of range conditions that are not backed by any index to calculate the cardinality of a partial join.5 - additionally use selectivity of certain non-range predicates calculated on record samples
  NUMERIC_MIN_VALUE	1
  NUMERIC_MAX_VALUE	5
-@@ -2437,7 +2437,7 @@
+@@ -2451,7 +2451,7 @@
  GLOBAL_VALUE_ORIGIN	CONFIG
  DEFAULT_VALUE	-1
  VARIABLE_SCOPE	GLOBAL
@@ -685,7 +694,7 @@
  VARIABLE_COMMENT	Maximum number of instrumented user@host accounts. Use 0 to disable, -1 for automated sizing.
  NUMERIC_MIN_VALUE	-1
  NUMERIC_MAX_VALUE	1048576
-@@ -2451,7 +2451,7 @@
+@@ -2465,7 +2465,7 @@
  GLOBAL_VALUE_ORIGIN	CONFIG
  DEFAULT_VALUE	-1
  VARIABLE_SCOPE	GLOBAL
@@ -694,7 +703,7 @@
  VARIABLE_COMMENT	Size of the statement digest. Use 0 to disable, -1 for automated sizing.
  NUMERIC_MIN_VALUE	-1
  NUMERIC_MAX_VALUE	200
-@@ -2465,7 +2465,7 @@
+@@ -2479,7 +2479,7 @@
  GLOBAL_VALUE_ORIGIN	CONFIG
  DEFAULT_VALUE	-1
  VARIABLE_SCOPE	GLOBAL
@@ -703,7 +712,7 @@
  VARIABLE_COMMENT	Number of rows in EVENTS_STAGES_HISTORY_LONG. Use 0 to disable, -1 for automated sizing.
  NUMERIC_MIN_VALUE	-1
  NUMERIC_MAX_VALUE	1048576
-@@ -2479,7 +2479,7 @@
+@@ -2493,7 +2493,7 @@
  GLOBAL_VALUE_ORIGIN	CONFIG
  DEFAULT_VALUE	-1
  VARIABLE_SCOPE	GLOBAL
@@ -712,7 +721,7 @@
  VARIABLE_COMMENT	Number of rows per thread in EVENTS_STAGES_HISTORY. Use 0 to disable, -1 for automated sizing.
  NUMERIC_MIN_VALUE	-1
  NUMERIC_MAX_VALUE	1024
-@@ -2493,7 +2493,7 @@
+@@ -2507,7 +2507,7 @@
  GLOBAL_VALUE_ORIGIN	CONFIG
  DEFAULT_VALUE	-1
  VARIABLE_SCOPE	GLOBAL
@@ -721,7 +730,7 @@
  VARIABLE_COMMENT	Number of rows in EVENTS_STATEMENTS_HISTORY_LONG. Use 0 to disable, -1 for automated sizing.
  NUMERIC_MIN_VALUE	-1
  NUMERIC_MAX_VALUE	1048576
-@@ -2507,7 +2507,7 @@
+@@ -2521,7 +2521,7 @@
  GLOBAL_VALUE_ORIGIN	CONFIG
  DEFAULT_VALUE	-1
  VARIABLE_SCOPE	GLOBAL
@@ -730,7 +739,7 @@
  VARIABLE_COMMENT	Number of rows per thread in EVENTS_STATEMENTS_HISTORY. Use 0 to disable, -1 for automated sizing.
  NUMERIC_MIN_VALUE	-1
  NUMERIC_MAX_VALUE	1024
-@@ -2521,7 +2521,7 @@
+@@ -2535,7 +2535,7 @@
  GLOBAL_VALUE_ORIGIN	CONFIG
  DEFAULT_VALUE	-1
  VARIABLE_SCOPE	GLOBAL
@@ -739,7 +748,7 @@
  VARIABLE_COMMENT	Number of rows in EVENTS_WAITS_HISTORY_LONG. Use 0 to disable, -1 for automated sizing.
  NUMERIC_MIN_VALUE	-1
  NUMERIC_MAX_VALUE	1048576
-@@ -2535,7 +2535,7 @@
+@@ -2549,7 +2549,7 @@
  GLOBAL_VALUE_ORIGIN	CONFIG
  DEFAULT_VALUE	-1
  VARIABLE_SCOPE	GLOBAL
@@ -748,7 +757,7 @@
  VARIABLE_COMMENT	Number of rows per thread in EVENTS_WAITS_HISTORY. Use 0 to disable, -1 for automated sizing.
  NUMERIC_MIN_VALUE	-1
  NUMERIC_MAX_VALUE	1024
-@@ -2549,7 +2549,7 @@
+@@ -2563,7 +2563,7 @@
  GLOBAL_VALUE_ORIGIN	CONFIG
  DEFAULT_VALUE	-1
  VARIABLE_SCOPE	GLOBAL
@@ -757,7 +766,7 @@
  VARIABLE_COMMENT	Maximum number of instrumented hosts. Use 0 to disable, -1 for automated sizing.
  NUMERIC_MIN_VALUE	-1
  NUMERIC_MAX_VALUE	1048576
-@@ -2563,7 +2563,7 @@
+@@ -2577,7 +2577,7 @@
  GLOBAL_VALUE_ORIGIN	COMPILE-TIME
  DEFAULT_VALUE	80
  VARIABLE_SCOPE	GLOBAL
@@ -766,7 +775,7 @@
  VARIABLE_COMMENT	Maximum number of condition instruments.
  NUMERIC_MIN_VALUE	0
  NUMERIC_MAX_VALUE	256
-@@ -2577,7 +2577,7 @@
+@@ -2591,7 +2591,7 @@
  GLOBAL_VALUE_ORIGIN	CONFIG
  DEFAULT_VALUE	-1
  VARIABLE_SCOPE	GLOBAL
@@ -775,7 +784,7 @@
  VARIABLE_COMMENT	Maximum number of instrumented condition objects. Use 0 to disable, -1 for automated sizing.
  NUMERIC_MIN_VALUE	-1
  NUMERIC_MAX_VALUE	1048576
-@@ -2591,7 +2591,7 @@
+@@ -2605,7 +2605,7 @@
  GLOBAL_VALUE_ORIGIN	COMPILE-TIME
  DEFAULT_VALUE	1024
  VARIABLE_SCOPE	GLOBAL
@@ -784,7 +793,7 @@
  VARIABLE_COMMENT	Maximum length considered for digest text, when stored in performance_schema tables.
  NUMERIC_MIN_VALUE	0
  NUMERIC_MAX_VALUE	1048576
-@@ -2605,7 +2605,7 @@
+@@ -2619,7 +2619,7 @@
  GLOBAL_VALUE_ORIGIN	COMPILE-TIME
  DEFAULT_VALUE	50
  VARIABLE_SCOPE	GLOBAL
@@ -793,7 +802,7 @@
  VARIABLE_COMMENT	Maximum number of file instruments.
  NUMERIC_MIN_VALUE	0
  NUMERIC_MAX_VALUE	256
-@@ -2619,7 +2619,7 @@
+@@ -2633,7 +2633,7 @@
  GLOBAL_VALUE_ORIGIN	COMPILE-TIME
  DEFAULT_VALUE	32768
  VARIABLE_SCOPE	GLOBAL
@@ -802,7 +811,7 @@
  VARIABLE_COMMENT	Maximum number of opened instrumented files.
  NUMERIC_MIN_VALUE	0
  NUMERIC_MAX_VALUE	1048576
-@@ -2633,7 +2633,7 @@
+@@ -2647,7 +2647,7 @@
  GLOBAL_VALUE_ORIGIN	CONFIG
  DEFAULT_VALUE	-1
  VARIABLE_SCOPE	GLOBAL
@@ -811,7 +820,7 @@
  VARIABLE_COMMENT	Maximum number of instrumented files. Use 0 to disable, -1 for automated sizing.
  NUMERIC_MIN_VALUE	-1
  NUMERIC_MAX_VALUE	1048576
-@@ -2647,7 +2647,7 @@
+@@ -2661,7 +2661,7 @@
  GLOBAL_VALUE_ORIGIN	COMPILE-TIME
  DEFAULT_VALUE	200
  VARIABLE_SCOPE	GLOBAL
@@ -820,7 +829,7 @@
  VARIABLE_COMMENT	Maximum number of mutex instruments.
  NUMERIC_MIN_VALUE	0
  NUMERIC_MAX_VALUE	256
-@@ -2661,7 +2661,7 @@
+@@ -2675,7 +2675,7 @@
  GLOBAL_VALUE_ORIGIN	CONFIG
  DEFAULT_VALUE	-1
  VARIABLE_SCOPE	GLOBAL
@@ -829,7 +838,7 @@
  VARIABLE_COMMENT	Maximum number of instrumented MUTEX objects. Use 0 to disable, -1 for automated sizing.
  NUMERIC_MIN_VALUE	-1
  NUMERIC_MAX_VALUE	104857600
-@@ -2675,7 +2675,7 @@
+@@ -2689,7 +2689,7 @@
  GLOBAL_VALUE_ORIGIN	COMPILE-TIME
  DEFAULT_VALUE	40
  VARIABLE_SCOPE	GLOBAL
@@ -838,7 +847,7 @@
  VARIABLE_COMMENT	Maximum number of rwlock instruments.
  NUMERIC_MIN_VALUE	0
  NUMERIC_MAX_VALUE	256
-@@ -2689,7 +2689,7 @@
+@@ -2703,7 +2703,7 @@
  GLOBAL_VALUE_ORIGIN	CONFIG
  DEFAULT_VALUE	-1
  VARIABLE_SCOPE	GLOBAL
@@ -847,7 +856,7 @@
  VARIABLE_COMMENT	Maximum number of instrumented RWLOCK objects. Use 0 to disable, -1 for automated sizing.
  NUMERIC_MIN_VALUE	-1
  NUMERIC_MAX_VALUE	104857600
-@@ -2703,7 +2703,7 @@
+@@ -2717,7 +2717,7 @@
  GLOBAL_VALUE_ORIGIN	COMPILE-TIME
  DEFAULT_VALUE	10
  VARIABLE_SCOPE	GLOBAL
@@ -856,7 +865,7 @@
  VARIABLE_COMMENT	Maximum number of socket instruments.
  NUMERIC_MIN_VALUE	0
  NUMERIC_MAX_VALUE	256
-@@ -2717,7 +2717,7 @@
+@@ -2731,7 +2731,7 @@
  GLOBAL_VALUE_ORIGIN	CONFIG
  DEFAULT_VALUE	-1
  VARIABLE_SCOPE	GLOBAL
@@ -865,7 +874,7 @@
  VARIABLE_COMMENT	Maximum number of opened instrumented sockets. Use 0 to disable, -1 for automated sizing.
  NUMERIC_MIN_VALUE	-1
  NUMERIC_MAX_VALUE	1048576
-@@ -2731,7 +2731,7 @@
+@@ -2745,7 +2745,7 @@
  GLOBAL_VALUE_ORIGIN	COMPILE-TIME
  DEFAULT_VALUE	150
  VARIABLE_SCOPE	GLOBAL
@@ -874,7 +883,7 @@
  VARIABLE_COMMENT	Maximum number of stage instruments.
  NUMERIC_MIN_VALUE	0
  NUMERIC_MAX_VALUE	256
-@@ -2745,7 +2745,7 @@
+@@ -2759,7 +2759,7 @@
  GLOBAL_VALUE_ORIGIN	COMPILE-TIME
  DEFAULT_VALUE	178
  VARIABLE_SCOPE	GLOBAL
@@ -883,7 +892,7 @@
  VARIABLE_COMMENT	Maximum number of statement instruments.
  NUMERIC_MIN_VALUE	0
  NUMERIC_MAX_VALUE	256
-@@ -2759,7 +2759,7 @@
+@@ -2773,7 +2773,7 @@
  GLOBAL_VALUE_ORIGIN	CONFIG
  DEFAULT_VALUE	-1
  VARIABLE_SCOPE	GLOBAL
@@ -892,7 +901,7 @@
  VARIABLE_COMMENT	Maximum number of opened instrumented tables. Use 0 to disable, -1 for automated sizing.
  NUMERIC_MIN_VALUE	-1
  NUMERIC_MAX_VALUE	1048576
-@@ -2773,7 +2773,7 @@
+@@ -2787,7 +2787,7 @@
  GLOBAL_VALUE_ORIGIN	CONFIG
  DEFAULT_VALUE	-1
  VARIABLE_SCOPE	GLOBAL
@@ -901,7 +910,7 @@
  VARIABLE_COMMENT	Maximum number of instrumented tables. Use 0 to disable, -1 for automated sizing.
  NUMERIC_MIN_VALUE	-1
  NUMERIC_MAX_VALUE	1048576
-@@ -2787,7 +2787,7 @@
+@@ -2801,7 +2801,7 @@
  GLOBAL_VALUE_ORIGIN	COMPILE-TIME
  DEFAULT_VALUE	50
  VARIABLE_SCOPE	GLOBAL
@@ -910,7 +919,7 @@
  VARIABLE_COMMENT	Maximum number of thread instruments.
  NUMERIC_MIN_VALUE	0
  NUMERIC_MAX_VALUE	256
-@@ -2801,7 +2801,7 @@
+@@ -2815,7 +2815,7 @@
  GLOBAL_VALUE_ORIGIN	CONFIG
  DEFAULT_VALUE	-1
  VARIABLE_SCOPE	GLOBAL
@@ -919,7 +928,7 @@
  VARIABLE_COMMENT	Maximum number of instrumented threads. Use 0 to disable, -1 for automated sizing.
  NUMERIC_MIN_VALUE	-1
  NUMERIC_MAX_VALUE	1048576
-@@ -2815,7 +2815,7 @@
+@@ -2829,7 +2829,7 @@
  GLOBAL_VALUE_ORIGIN	CONFIG
  DEFAULT_VALUE	-1
  VARIABLE_SCOPE	GLOBAL
@@ -928,7 +937,7 @@
  VARIABLE_COMMENT	Size of session attribute string buffer per thread. Use 0 to disable, -1 for automated sizing.
  NUMERIC_MIN_VALUE	-1
  NUMERIC_MAX_VALUE	1048576
-@@ -2829,7 +2829,7 @@
+@@ -2843,7 +2843,7 @@
  GLOBAL_VALUE_ORIGIN	COMPILE-TIME
  DEFAULT_VALUE	100
  VARIABLE_SCOPE	GLOBAL
@@ -937,7 +946,7 @@
  VARIABLE_COMMENT	Maximum number of rows in SETUP_ACTORS.
  NUMERIC_MIN_VALUE	0
  NUMERIC_MAX_VALUE	1024
-@@ -2843,7 +2843,7 @@
+@@ -2857,7 +2857,7 @@
  GLOBAL_VALUE_ORIGIN	COMPILE-TIME
  DEFAULT_VALUE	100
  VARIABLE_SCOPE	GLOBAL
@@ -946,7 +955,7 @@
  VARIABLE_COMMENT	Maximum number of rows in SETUP_OBJECTS.
  NUMERIC_MIN_VALUE	0
  NUMERIC_MAX_VALUE	1048576
-@@ -2857,7 +2857,7 @@
+@@ -2871,7 +2871,7 @@
  GLOBAL_VALUE_ORIGIN	CONFIG
  DEFAULT_VALUE	-1
  VARIABLE_SCOPE	GLOBAL
@@ -955,7 +964,7 @@
  VARIABLE_COMMENT	Maximum number of instrumented users. Use 0 to disable, -1 for automated sizing.
  NUMERIC_MIN_VALUE	-1
  NUMERIC_MAX_VALUE	1048576
-@@ -2927,7 +2927,7 @@
+@@ -2941,7 +2941,7 @@
  GLOBAL_VALUE_ORIGIN	COMPILE-TIME
  DEFAULT_VALUE	32768
  VARIABLE_SCOPE	SESSION
@@ -964,7 +973,7 @@
  VARIABLE_COMMENT	The size of the buffer that is allocated when preloading indexes
  NUMERIC_MIN_VALUE	1024
  NUMERIC_MAX_VALUE	1073741824
-@@ -2955,7 +2955,7 @@
+@@ -2969,7 +2969,7 @@
  GLOBAL_VALUE_ORIGIN	COMPILE-TIME
  DEFAULT_VALUE	15
  VARIABLE_SCOPE	SESSION
@@ -973,7 +982,7 @@
  VARIABLE_COMMENT	Limit of query profiling memory
  NUMERIC_MIN_VALUE	0
  NUMERIC_MAX_VALUE	100
-@@ -2969,7 +2969,7 @@
+@@ -2983,7 +2983,7 @@
  GLOBAL_VALUE_ORIGIN	COMPILE-TIME
  DEFAULT_VALUE	5
  VARIABLE_SCOPE	SESSION
@@ -982,7 +991,7 @@
  VARIABLE_COMMENT	Seconds between sending progress reports to the client for time-consuming statements. Set to 0 to disable progress reporting.
  NUMERIC_MIN_VALUE	0
  NUMERIC_MAX_VALUE	4294967295
-@@ -3025,10 +3025,10 @@
+@@ -3039,10 +3039,10 @@
  GLOBAL_VALUE_ORIGIN	COMPILE-TIME
  DEFAULT_VALUE	0
  VARIABLE_SCOPE	SESSION ONLY
@@ -995,7 +1004,7 @@
  NUMERIC_BLOCK_SIZE	1
  ENUM_VALUE_LIST	NULL
  READ_ONLY	NO
-@@ -3039,7 +3039,7 @@
+@@ -3053,7 +3053,7 @@
  GLOBAL_VALUE_ORIGIN	COMPILE-TIME
  DEFAULT_VALUE	16384
  VARIABLE_SCOPE	SESSION
@@ -1004,7 +1013,7 @@
  VARIABLE_COMMENT	Allocation block size for query parsing and execution
  NUMERIC_MIN_VALUE	1024
  NUMERIC_MAX_VALUE	4294967295
-@@ -3053,7 +3053,7 @@
+@@ -3067,7 +3067,7 @@
  GLOBAL_VALUE_ORIGIN	COMPILE-TIME
  DEFAULT_VALUE	1048576
  VARIABLE_SCOPE	GLOBAL
@@ -1013,7 +1022,7 @@
  VARIABLE_COMMENT	Don't cache results that are bigger than this
  NUMERIC_MIN_VALUE	0
  NUMERIC_MAX_VALUE	4294967295
-@@ -3067,7 +3067,7 @@
+@@ -3081,7 +3081,7 @@
  GLOBAL_VALUE_ORIGIN	COMPILE-TIME
  DEFAULT_VALUE	4096
  VARIABLE_SCOPE	GLOBAL
@@ -1022,7 +1031,7 @@
  VARIABLE_COMMENT	The minimum size for blocks allocated by the query cache
  NUMERIC_MIN_VALUE	0
  NUMERIC_MAX_VALUE	4294967295
-@@ -3084,7 +3084,7 @@
+@@ -3098,7 +3098,7 @@
  VARIABLE_TYPE	BIGINT UNSIGNED
  VARIABLE_COMMENT	The memory allocated to store results from old queries
  NUMERIC_MIN_VALUE	0
@@ -1031,7 +1040,7 @@
  NUMERIC_BLOCK_SIZE	1024
  ENUM_VALUE_LIST	NULL
  READ_ONLY	NO
-@@ -3137,7 +3137,7 @@
+@@ -3151,7 +3151,7 @@
  GLOBAL_VALUE_ORIGIN	COMPILE-TIME
  DEFAULT_VALUE	24576
  VARIABLE_SCOPE	SESSION
@@ -1040,7 +1049,7 @@
  VARIABLE_COMMENT	Persistent buffer for query parsing and execution
  NUMERIC_MIN_VALUE	1024
  NUMERIC_MAX_VALUE	4294967295
-@@ -3151,7 +3151,7 @@
+@@ -3165,7 +3165,7 @@
  GLOBAL_VALUE_ORIGIN	COMPILE-TIME
  DEFAULT_VALUE	4096
  VARIABLE_SCOPE	SESSION
@@ -1049,7 +1058,7 @@
  VARIABLE_COMMENT	Allocation block size for storing ranges during optimization
  NUMERIC_MIN_VALUE	4096
  NUMERIC_MAX_VALUE	4294967295
-@@ -3165,7 +3165,7 @@
+@@ -3179,7 +3179,7 @@
  GLOBAL_VALUE_ORIGIN	COMPILE-TIME
  DEFAULT_VALUE	131072
  VARIABLE_SCOPE	SESSION
@@ -1058,7 +1067,7 @@
  VARIABLE_COMMENT	Each thread that does a sequential scan allocates a buffer of this size for each table it scans. If you do many sequential scans, you may want to increase this value
  NUMERIC_MIN_VALUE	8192
  NUMERIC_MAX_VALUE	2147483647
-@@ -3193,7 +3193,7 @@
+@@ -3207,7 +3207,7 @@
  GLOBAL_VALUE_ORIGIN	COMPILE-TIME
  DEFAULT_VALUE	262144
  VARIABLE_SCOPE	SESSION
@@ -1067,7 +1076,7 @@
  VARIABLE_COMMENT	When reading rows in sorted order after a sort, the rows are read through this buffer to avoid a disk seeks
  NUMERIC_MIN_VALUE	1
  NUMERIC_MAX_VALUE	2147483647
-@@ -3207,10 +3207,10 @@
+@@ -3221,10 +3221,10 @@
  GLOBAL_VALUE_ORIGIN	COMPILE-TIME
  DEFAULT_VALUE	8388608
  VARIABLE_SCOPE	SESSION
@@ -1080,7 +1089,7 @@
  NUMERIC_BLOCK_SIZE	1
  ENUM_VALUE_LIST	NULL
  READ_ONLY	NO
-@@ -3249,7 +3249,7 @@
+@@ -3263,7 +3263,7 @@
  GLOBAL_VALUE_ORIGIN	CONFIG
  DEFAULT_VALUE	0
  VARIABLE_SCOPE	SESSION
@@ -1089,7 +1098,7 @@
  VARIABLE_COMMENT	Uniquely identifies the server instance in the community of replication partners
  NUMERIC_MIN_VALUE	0
  NUMERIC_MAX_VALUE	4294967295
-@@ -3347,7 +3347,7 @@
+@@ -3361,7 +3361,7 @@
  GLOBAL_VALUE_ORIGIN	COMPILE-TIME
  DEFAULT_VALUE	1073741824
  VARIABLE_SCOPE	GLOBAL
@@ -1098,7 +1107,7 @@
  VARIABLE_COMMENT	The maximum packet length to sent successfully from the master to slave.
  NUMERIC_MIN_VALUE	1024
  NUMERIC_MAX_VALUE	1073741824
-@@ -3361,7 +3361,7 @@
+@@ -3375,7 +3375,7 @@
  GLOBAL_VALUE_ORIGIN	COMPILE-TIME
  DEFAULT_VALUE	2
  VARIABLE_SCOPE	GLOBAL
@@ -1107,7 +1116,7 @@
  VARIABLE_COMMENT	If creating the thread takes longer than this value (in seconds), the Slow_launch_threads counter will be incremented
  NUMERIC_MIN_VALUE	0
  NUMERIC_MAX_VALUE	31536000
-@@ -3420,7 +3420,7 @@
+@@ -3434,7 +3434,7 @@
  VARIABLE_TYPE	BIGINT UNSIGNED
  VARIABLE_COMMENT	Each thread that needs to do a sort allocates a buffer of this size
  NUMERIC_MIN_VALUE	1024
@@ -1116,7 +1125,7 @@
  NUMERIC_BLOCK_SIZE	1
  ENUM_VALUE_LIST	NULL
  READ_ONLY	NO
-@@ -3697,7 +3697,7 @@
+@@ -3711,7 +3711,7 @@
  GLOBAL_VALUE_ORIGIN	COMPILE-TIME
  DEFAULT_VALUE	256
  VARIABLE_SCOPE	GLOBAL
@@ -1125,7 +1134,7 @@
  VARIABLE_COMMENT	The soft upper limit for number of cached stored routines for one connection.
  NUMERIC_MIN_VALUE	0
  NUMERIC_MAX_VALUE	524288
-@@ -3767,7 +3767,7 @@
+@@ -3781,7 +3781,7 @@
  GLOBAL_VALUE_ORIGIN	COMPILE-TIME
  DEFAULT_VALUE	400
  VARIABLE_SCOPE	GLOBAL
@@ -1134,16 +1143,16 @@
  VARIABLE_COMMENT	The number of cached table definitions
  NUMERIC_MIN_VALUE	400
  NUMERIC_MAX_VALUE	524288
-@@ -3781,7 +3781,7 @@
+@@ -3795,7 +3795,7 @@
  GLOBAL_VALUE_ORIGIN	COMPILE-TIME
- DEFAULT_VALUE	400
+ DEFAULT_VALUE	2000
  VARIABLE_SCOPE	GLOBAL
 -VARIABLE_TYPE	BIGINT UNSIGNED
 +VARIABLE_TYPE	INT UNSIGNED
  VARIABLE_COMMENT	The number of cached open tables
  NUMERIC_MIN_VALUE	1
  NUMERIC_MAX_VALUE	524288
-@@ -3795,7 +3795,7 @@
+@@ -3809,7 +3809,7 @@
  GLOBAL_VALUE_ORIGIN	COMPILE-TIME
  DEFAULT_VALUE	0
  VARIABLE_SCOPE	GLOBAL
@@ -1152,7 +1161,7 @@
  VARIABLE_COMMENT	How many threads we should keep in a cache for reuse
  NUMERIC_MIN_VALUE	0
  NUMERIC_MAX_VALUE	16384
-@@ -3809,7 +3809,7 @@
+@@ -3823,7 +3823,7 @@
  GLOBAL_VALUE_ORIGIN	COMPILE-TIME
  DEFAULT_VALUE	10
  VARIABLE_SCOPE	GLOBAL
@@ -1161,7 +1170,7 @@
  VARIABLE_COMMENT	Permits the application to give the threads system a hint for the desired number of threads that should be run at the same time.This variable has no effect, and is deprecated. It will be removed in a future release.
  NUMERIC_MIN_VALUE	1
  NUMERIC_MAX_VALUE	512
-@@ -3924,7 +3924,7 @@
+@@ -3938,7 +3938,7 @@
  VARIABLE_TYPE	BIGINT UNSIGNED
  VARIABLE_COMMENT	If an internal in-memory temporary table exceeds this size, MySQL will automatically convert it to an on-disk MyISAM or Aria table
  NUMERIC_MIN_VALUE	1024
@@ -1170,7 +1179,7 @@
  NUMERIC_BLOCK_SIZE	1
  ENUM_VALUE_LIST	NULL
  READ_ONLY	NO
-@@ -3935,7 +3935,7 @@
+@@ -3949,7 +3949,7 @@
  GLOBAL_VALUE_ORIGIN	COMPILE-TIME
  DEFAULT_VALUE	8192
  VARIABLE_SCOPE	SESSION
@@ -1179,7 +1188,7 @@
  VARIABLE_COMMENT	Allocation block size for transactions to be stored in binary log
  NUMERIC_MIN_VALUE	1024
  NUMERIC_MAX_VALUE	134217728
-@@ -3949,7 +3949,7 @@
+@@ -3963,7 +3963,7 @@
  GLOBAL_VALUE_ORIGIN	COMPILE-TIME
  DEFAULT_VALUE	4096
  VARIABLE_SCOPE	SESSION
@@ -1188,7 +1197,7 @@
  VARIABLE_COMMENT	Persistent buffer for transactions to be stored in binary log
  NUMERIC_MIN_VALUE	1024
  NUMERIC_MAX_VALUE	134217728
-@@ -4047,7 +4047,7 @@
+@@ -4061,7 +4061,7 @@
  GLOBAL_VALUE_ORIGIN	COMPILE-TIME
  DEFAULT_VALUE	28800
  VARIABLE_SCOPE	SESSION
@@ -1197,7 +1206,7 @@
  VARIABLE_COMMENT	The number of seconds the server waits for activity on a connection before closing it
  NUMERIC_MIN_VALUE	1
  NUMERIC_MAX_VALUE	31536000
-@@ -4151,7 +4151,7 @@
+@@ -4165,7 +4165,7 @@
  COMMAND_LINE_ARGUMENT	OPTIONAL
  VARIABLE_NAME	OPEN_FILES_LIMIT
  VARIABLE_SCOPE	GLOBAL
@@ -1206,7 +1215,7 @@
  VARIABLE_COMMENT	If this is not 0, then mysqld will use this value to reserve file descriptors to use with setrlimit(). If this value is 0 then mysqld will reserve max_connections*5 or max_connections + table_cache*2 (whichever is larger) number of file descriptors
  NUMERIC_MIN_VALUE	0
  NUMERIC_MAX_VALUE	4294967295
-@@ -4164,7 +4164,7 @@
+@@ -4178,7 +4178,7 @@
  VARIABLE_TYPE	BIGINT UNSIGNED
  VARIABLE_COMMENT	Sets the internal state of the RAND() generator for replication purposes
  NUMERIC_MIN_VALUE	0
@@ -1215,7 +1224,7 @@
  NUMERIC_BLOCK_SIZE	1
  ENUM_VALUE_LIST	NULL
  READ_ONLY	NO
-@@ -4174,7 +4174,7 @@
+@@ -4188,7 +4188,7 @@
  VARIABLE_TYPE	BIGINT UNSIGNED
  VARIABLE_COMMENT	Sets the internal state of the RAND() generator for replication purposes
  NUMERIC_MIN_VALUE	0
@@ -1224,7 +1233,7 @@
  NUMERIC_BLOCK_SIZE	1
  ENUM_VALUE_LIST	NULL
  READ_ONLY	NO
-@@ -4259,7 +4259,7 @@
+@@ -4273,7 +4273,7 @@
  VARIABLE_NAME	LOG_TC_SIZE
  GLOBAL_VALUE_ORIGIN	AUTO
  VARIABLE_SCOPE	GLOBAL
diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc
index c1624ed0663ad2f5c38f787b93c90a0c8b3f48b3..b07c756e81f4bd15c25afa9cf87408bb8c43c294 100644
--- a/storage/innobase/handler/ha_innodb.cc
+++ b/storage/innobase/handler/ha_innodb.cc
@@ -108,7 +108,7 @@ this program; if not, write to the Free Software Foundation, Inc.,
 #define thd_get_trx_isolation(X) ((enum_tx_isolation)thd_tx_isolation(X))
 
 #ifdef MYSQL_DYNAMIC_PLUGIN
-#define tc_size 400
+#define tc_size 2000
 #define tdc_size 400
 #endif