test failure

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;

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 `Ｃ１`, CONVERT(`Ｃ１` using utf8) FROM `Ｔ４`;
 Ｃ１	CONVERT(`Ｃ１` 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 `Ｃ１`, CONVERT(`Ｃ１` using utf8) FROM `Ｔ７`;
 Ｃ１	CONVERT(`Ｃ１` 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 `Ｔ１`;
 drop table `Ｔ２`;
 drop table `Ｔ３`;

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

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