Fixed test failures

mysql-test/suite/funcs_1/r/is_columns_is.result:
  Update after change of comment length
mysql-test/suite/funcs_1/r/is_engines.result:
  Update after change of comment length
mysql-test/suite/innodb_plugin/t/disabled.def:
  Disable a test that gives valgrind warnings for xtradb
mysql-test/suite/innodb_plugin/t/innodb_bug52745.test:
  Test requires persian collation

mysql-test/suite/funcs_1/r/is_columns_is.result

@@ -41,7 +41,7 @@ NULL	information_schema	COLUMN_PRIVILEGES	PRIVILEGE_TYPE	6		NO	varchar	64	192	NU
 NULL	information_schema	COLUMN_PRIVILEGES	TABLE_CATALOG	2	NULL	YES	varchar	512	1536	NULL	NULL	utf8	utf8_general_ci	varchar(512)			select	
 NULL	information_schema	COLUMN_PRIVILEGES	TABLE_NAME	4		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMN_PRIVILEGES	TABLE_SCHEMA	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	ENGINES	COMMENT	3		NO	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
+NULL	information_schema	ENGINES	COMMENT	3		NO	varchar	160	480	NULL	NULL	utf8	utf8_general_ci	varchar(160)			select	
 NULL	information_schema	ENGINES	ENGINE	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	ENGINES	SAVEPOINTS	6	NULL	YES	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
 NULL	information_schema	ENGINES	SUPPORT	2		NO	varchar	8	24	NULL	NULL	utf8	utf8_general_ci	varchar(8)			select	
@@ -516,7 +516,7 @@ NULL	information_schema	COLUMNS	NUMERIC_SCALE	bigint	NULL	NULL	NULL	NULL	bigint(
 3.0000	information_schema	COLUMN_PRIVILEGES	IS_GRANTABLE	varchar	3	9	utf8	utf8_general_ci	varchar(3)
 3.0000	information_schema	ENGINES	ENGINE	varchar	64	192	utf8	utf8_general_ci	varchar(64)
 3.0000	information_schema	ENGINES	SUPPORT	varchar	8	24	utf8	utf8_general_ci	varchar(8)
-3.0000	information_schema	ENGINES	COMMENT	varchar	80	240	utf8	utf8_general_ci	varchar(80)
+3.0000	information_schema	ENGINES	COMMENT	varchar	160	480	utf8	utf8_general_ci	varchar(160)
 3.0000	information_schema	ENGINES	TRANSACTIONS	varchar	3	9	utf8	utf8_general_ci	varchar(3)
 3.0000	information_schema	ENGINES	XA	varchar	3	9	utf8	utf8_general_ci	varchar(3)
 3.0000	information_schema	ENGINES	SAVEPOINTS	varchar	3	9	utf8	utf8_general_ci	varchar(3)

mysql-test/suite/funcs_1/r/is_engines.result

@@ -30,7 +30,7 @@ DESCRIBE          information_schema.ENGINES;
 Field	Type	Null	Key	Default	Extra
 ENGINE	varchar(64)	NO			
 SUPPORT	varchar(8)	NO			
-COMMENT	varchar(80)	NO			
+COMMENT	varchar(160)	NO			
 TRANSACTIONS	varchar(3)	YES		NULL	
 XA	varchar(3)	YES		NULL	
 SAVEPOINTS	varchar(3)	YES		NULL	
@@ -39,7 +39,7 @@ Table	Create Table
 ENGINES	CREATE TEMPORARY TABLE `ENGINES` (
   `ENGINE` varchar(64) NOT NULL DEFAULT '',
   `SUPPORT` varchar(8) NOT NULL DEFAULT '',
-  `COMMENT` varchar(80) NOT NULL DEFAULT '',
+  `COMMENT` varchar(160) NOT NULL DEFAULT '',
   `TRANSACTIONS` varchar(3) DEFAULT NULL,
   `XA` varchar(3) DEFAULT NULL,
   `SAVEPOINTS` varchar(3) DEFAULT NULL
@@ -48,7 +48,7 @@ SHOW COLUMNS FROM information_schema.ENGINES;
 Field	Type	Null	Key	Default	Extra
 ENGINE	varchar(64)	NO			
 SUPPORT	varchar(8)	NO			
-COMMENT	varchar(80)	NO			
+COMMENT	varchar(160)	NO			
 TRANSACTIONS	varchar(3)	YES		NULL	
 XA	varchar(3)	YES		NULL	
 SAVEPOINTS	varchar(3)	YES		NULL	

mysql-test/suite/innodb_plugin/t/disabled.def

@@ -17,3 +17,4 @@ innodb_bug53592 : Waiting for merge/fix from XtraDB
 innodb-use-sys-malloc : Waiting for bugfix from Percona for LP#612600
 innodb_bug53290 : Waiting for merge/fix from XtraDB
 innodb_bug54679 : Waiting for merge/fix from XtraDB
+innodb_bug52745 : Waiting for merge/fix from XtraDB

mysql-test/suite/innodb_plugin/t/innodb_bug52745.test

 -- source include/have_innodb_plugin.inc
+let collation=utf8_persian_ci;
+--source include/have_collation.inc
 
 let $file_format=`select @@innodb_file_format`;
 let $file_format_check=`select @@innodb_file_format_check`;