=== modified file 'Percona-Server/mysql-test/r/table_definition_cache_functionality.result'
--- Percona-Server/mysql-test/r/table_definition_cache_functionality.result	2012-10-22 13:43:09 +0000
+++ Percona-Server/mysql-test/r/table_definition_cache_functionality.result	2013-06-20 15:16:00 +0000
@@ -7,8 +7,8 @@
 SELECT COUNT(@@GLOBAL.table_definition_cache)
 1 Expected
 SET @@GLOBAL.table_definition_cache=DEFAULT;
-SELECT @@GLOBAL.table_definition_cache;
-@@GLOBAL.table_definition_cache
+SELECT IF (@@open_files_limit < 5000, 1400, @@GLOBAL.table_definition_cache);
+IF (@@open_files_limit < 5000, 1400, @@GLOBAL.table_definition_cache)
 1400
 1400 Expected
 '#---------------------WL6372_VAR_5_02----------------------#'
@@ -18,8 +18,8 @@
 2000
 2000 Expected
 SET @@GLOBAL.table_definition_cache=DEFAULT;
-SELECT @@GLOBAL.table_definition_cache;
-@@GLOBAL.table_definition_cache
+SELECT IF (@@open_files_limit < 5000, 1400, @@GLOBAL.table_definition_cache);
+IF (@@open_files_limit < 5000, 1400, @@GLOBAL.table_definition_cache)
 1400
 1400 Expected
 '#---------------------WL6372_VAR_5_03----------------------#'
@@ -31,8 +31,8 @@
 Expected error 'Global variable'
 SET @@GLOBAL.table_definition_cache=1;
 SET @@GLOBAL.table_definition_cache=DEFAULT;
-SELECT @@GLOBAL.table_definition_cache;
-@@GLOBAL.table_definition_cache
+SELECT IF (@@open_files_limit < 5000, 1400, @@GLOBAL.table_definition_cache);
+IF (@@open_files_limit < 5000, 1400, @@GLOBAL.table_definition_cache)
 1400
 1400 Expected
 '#---------------------WL6372_VAR_5_04----------------------#'

=== modified file 'Percona-Server/mysql-test/r/table_open_cache_functionality.result'
--- Percona-Server/mysql-test/r/table_open_cache_functionality.result	2012-10-09 12:36:52 +0000
+++ Percona-Server/mysql-test/r/table_open_cache_functionality.result	2013-06-20 15:16:00 +0000
@@ -6,8 +6,8 @@
 ####################################################################
 SELECT COUNT(@@GLOBAL.table_open_cache)
 1 Expected
-SELECT @@GLOBAL.table_open_cache;
-@@GLOBAL.table_open_cache
+SELECT IF(@@open_files_limit < 5000, 2000, @@GLOBAL.table_open_cache);
+IF(@@open_files_limit < 5000, 2000, @@GLOBAL.table_open_cache)
 2000
 2000 Expected
 '#---------------------WL6372_VAR_5_02----------------------#'

=== modified file 'Percona-Server/mysql-test/suite/sys_vars/r/table_definition_cache_basic.result'
--- Percona-Server/mysql-test/suite/sys_vars/r/table_definition_cache_basic.result	2012-10-09 12:36:52 +0000
+++ Percona-Server/mysql-test/suite/sys_vars/r/table_definition_cache_basic.result	2013-06-20 15:16:00 +0000
@@ -1,19 +1,19 @@
 SET @start_value = @@global.table_definition_cache;
-SELECT @start_value;
-@start_value
+SELECT IF(@@open_files_limit < 5000, 1400, @start_value);
+IF(@@open_files_limit < 5000, 1400, @start_value)
 1400
 '#--------------------FN_DYNVARS_019_01------------------------#'
 SET @@global.table_definition_cache = 100;
 Warnings:
 Warning	1292	Truncated incorrect table_definition_cache value: '100'
 SET @@global.table_definition_cache = DEFAULT;
-SELECT @@global.table_definition_cache;
-@@global.table_definition_cache
+SELECT IF(@@open_files_limit < 5000, 1400, @@global.table_definition_cache);
+IF(@@open_files_limit < 5000, 1400, @@global.table_definition_cache)
 1400
 '#---------------------FN_DYNVARS_019_02-------------------------#'
 SET @@global.table_definition_cache = DEFAULT;
-SELECT @@global.table_definition_cache = 1400;
-@@global.table_definition_cache = 1400
+SELECT IF(@@open_files_limit < 5000, 1400, @@global.table_definition_cache) = 1400;
+IF(@@open_files_limit < 5000, 1400, @@global.table_definition_cache) = 1400
 1
 '#--------------------FN_DYNVARS_019_03------------------------#'
 SET @@global.table_definition_cache = 1;
@@ -106,6 +106,6 @@
 SELECT table_definition_cache = @@session.table_definition_cache;
 ERROR 42S22: Unknown column 'table_definition_cache' in 'field list'
 SET @@global.table_definition_cache = @start_value;
-SELECT @@global.table_definition_cache;
-@@global.table_definition_cache
+SELECT IF(@@open_files_limit < 5000, 1400, @@global.table_definition_cache);
+IF(@@open_files_limit < 5000, 1400, @@global.table_definition_cache)
 1400

=== modified file 'Percona-Server/mysql-test/suite/sys_vars/r/table_open_cache_basic.result'
--- Percona-Server/mysql-test/suite/sys_vars/r/table_open_cache_basic.result	2012-10-09 12:36:52 +0000
+++ Percona-Server/mysql-test/suite/sys_vars/r/table_open_cache_basic.result	2013-06-20 15:16:00 +0000
@@ -1,6 +1,6 @@
 SET @start_value = @@global.table_open_cache ;
-SELECT @start_value;
-@start_value
+SELECT IF(@@open_files_limit < 5000, 2000, @start_value);
+IF(@@open_files_limit < 5000, 2000, @start_value)
 2000
 '#--------------------FN_DYNVARS_001_01------------------------#'
 SET @@global.table_open_cache  = 99;
@@ -10,8 +10,8 @@
 2000
 '#---------------------FN_DYNVARS_001_02-------------------------#'
 SET @@global.table_open_cache = Default;
-SELECT @@global.table_open_cache  = 2000;
-@@global.table_open_cache  = 2000
+SELECT IF(@@open_files_limit < 5000, 2000, @@global.table_open_cache) = 2000;
+IF(@@open_files_limit < 5000, 2000, @@global.table_open_cache) = 2000
 1
 '#--------------------FN_DYNVARS_001_03------------------------#'
 SET @@global.table_open_cache  = 8;
@@ -102,6 +102,6 @@
 SELECT table_open_cache = @@session.table_open_cache ;
 ERROR 42S22: Unknown column 'table_open_cache' in 'field list'
 SET @@global.table_open_cache = @start_value;
-SELECT @@global.table_open_cache ;
-@@global.table_open_cache
+SELECT IF(@@open_files_limit < 5000, 2000, @start_value);
+IF(@@open_files_limit < 5000, 2000, @start_value)
 2000

=== modified file 'Percona-Server/mysql-test/suite/sys_vars/t/table_definition_cache_basic.test'
--- Percona-Server/mysql-test/suite/sys_vars/t/table_definition_cache_basic.test	2012-10-09 12:36:52 +0000
+++ Percona-Server/mysql-test/suite/sys_vars/t/table_definition_cache_basic.test	2013-06-20 15:16:00 +0000
@@ -34,7 +34,7 @@
 ##############################################################################
 
 SET @start_value = @@global.table_definition_cache;
-SELECT @start_value;
+SELECT IF(@@open_files_limit < 5000, 1400, @start_value);
 
 --echo '#--------------------FN_DYNVARS_019_01------------------------#'
 #######################################################################
@@ -43,7 +43,7 @@
 
 SET @@global.table_definition_cache = 100;
 SET @@global.table_definition_cache = DEFAULT;
-SELECT @@global.table_definition_cache;
+SELECT IF(@@open_files_limit < 5000, 1400, @@global.table_definition_cache);
 
 
 --echo '#---------------------FN_DYNVARS_019_02-------------------------#'
@@ -52,7 +52,7 @@
 ###############################################
 
 SET @@global.table_definition_cache = DEFAULT;
-SELECT @@global.table_definition_cache = 1400;
+SELECT IF(@@open_files_limit < 5000, 1400, @@global.table_definition_cache) = 1400;
 
 
 --echo '#--------------------FN_DYNVARS_019_03------------------------#'
@@ -149,7 +149,7 @@
 ##############################
 
 SET @@global.table_definition_cache = @start_value;
-SELECT @@global.table_definition_cache;
+SELECT IF(@@open_files_limit < 5000, 1400, @@global.table_definition_cache);
 
 
 ################################################################

=== modified file 'Percona-Server/mysql-test/suite/sys_vars/t/table_open_cache_basic.test'
--- Percona-Server/mysql-test/suite/sys_vars/t/table_open_cache_basic.test	2012-10-09 12:36:52 +0000
+++ Percona-Server/mysql-test/suite/sys_vars/t/table_open_cache_basic.test	2013-06-20 15:16:00 +0000
@@ -35,7 +35,7 @@
 ########################################################################## 
 
 SET @start_value = @@global.table_open_cache ;
-SELECT @start_value;
+SELECT IF(@@open_files_limit < 5000, 2000, @start_value);
 
 
 --echo '#--------------------FN_DYNVARS_001_01------------------------#'
@@ -54,7 +54,7 @@
 ############################################### 
 
 SET @@global.table_open_cache = Default;
-SELECT @@global.table_open_cache  = 2000;
+SELECT IF(@@open_files_limit < 5000, 2000, @@global.table_open_cache) = 2000;
 
 --echo '#--------------------FN_DYNVARS_001_03------------------------#'
 ######################################################################## 
@@ -165,7 +165,7 @@
 ##############################
 
 SET @@global.table_open_cache = @start_value;
-SELECT @@global.table_open_cache ;
+SELECT IF(@@open_files_limit < 5000, 2000, @start_value);
 
 
 ##################################################################

=== modified file 'Percona-Server/mysql-test/t/table_definition_cache_functionality.test'
--- Percona-Server/mysql-test/t/table_definition_cache_functionality.test	2012-10-22 13:43:09 +0000
+++ Percona-Server/mysql-test/t/table_definition_cache_functionality.test	2013-06-20 15:16:00 +0000
@@ -35,7 +35,7 @@
 --echo 1 Expected
 
 SET @@GLOBAL.table_definition_cache=DEFAULT;
-SELECT @@GLOBAL.table_definition_cache;
+SELECT IF (@@open_files_limit < 5000, 1400, @@GLOBAL.table_definition_cache);
 --echo 1400 Expected
 
 
@@ -57,7 +57,7 @@
 --echo 2000 Expected
 
 SET @@GLOBAL.table_definition_cache=DEFAULT;
-SELECT @@GLOBAL.table_definition_cache;
+SELECT IF (@@open_files_limit < 5000, 1400, @@GLOBAL.table_definition_cache);
 --echo 1400 Expected
 
 
@@ -81,7 +81,7 @@
 SET @@GLOBAL.table_definition_cache=DEFAULT;
 
 
-SELECT @@GLOBAL.table_definition_cache;
+SELECT IF (@@open_files_limit < 5000, 1400, @@GLOBAL.table_definition_cache);
 --echo 1400 Expected
 
 --echo '#---------------------WL6372_VAR_5_04----------------------#'

=== modified file 'Percona-Server/mysql-test/t/table_open_cache_functionality.test'
--- Percona-Server/mysql-test/t/table_open_cache_functionality.test	2012-10-09 12:36:52 +0000
+++ Percona-Server/mysql-test/t/table_open_cache_functionality.test	2013-06-20 15:16:00 +0000
@@ -41,7 +41,7 @@
 SELECT COUNT(@@GLOBAL.table_open_cache);
 --echo 1 Expected
 
-SELECT @@GLOBAL.table_open_cache;
+SELECT IF(@@open_files_limit < 5000, 2000, @@GLOBAL.table_open_cache);
 --echo 2000 Expected