diff --git a/mysql-test/r/table_definition_cache_basic.result b/mysql-test/r/table_definition_cache_basic.result
index 5f0e1960358..13055d00600 100644
--- a/mysql-test/r/table_definition_cache_basic.result
+++ b/mysql-test/r/table_definition_cache_basic.result
@@ -1,7 +1,7 @@
 SET @start_value = @@global.table_definition_cache;
 SELECT @start_value;
 @start_value
-256
+400
 '#--------------------FN_DYNVARS_019_01------------------------#'
 SET @@global.table_definition_cache = 100;
 Warnings:
@@ -9,12 +9,12 @@ Warning	1292	Truncated incorrect table_definition_cache value: '100'
 SET @@global.table_definition_cache = DEFAULT;
 SELECT @@global.table_definition_cache;
 @@global.table_definition_cache
-256
+400
 '#---------------------FN_DYNVARS_019_02-------------------------#'
 SET @@global.table_definition_cache = DEFAULT;
-SELECT @@global.table_definition_cache = 128;
-@@global.table_definition_cache = 128
-0
+SELECT @@global.table_definition_cache = 400;
+@@global.table_definition_cache = 400
+1
 '#--------------------FN_DYNVARS_019_03------------------------#'
 SET @@global.table_definition_cache = 1;
 Warnings:
@@ -109,4 +109,4 @@ 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
-256
+400
diff --git a/mysql-test/r/table_open_cache_basic.result b/mysql-test/r/table_open_cache_basic.result
index ca02d32386f..b6891956489 100644
--- a/mysql-test/r/table_open_cache_basic.result
+++ b/mysql-test/r/table_open_cache_basic.result
@@ -1,17 +1,17 @@
 SET @start_value = @@global.table_open_cache ;
 SELECT @start_value;
 @start_value
-64
+400
 '#--------------------FN_DYNVARS_001_01------------------------#'
 SET @@global.table_open_cache  = 99;
 SET @@global.table_open_cache  = DeFAULT;
 SELECT @@global.table_open_cache;
 @@global.table_open_cache
-64
+400
 '#---------------------FN_DYNVARS_001_02-------------------------#'
 SET @@global.table_open_cache = Default;
-SELECT @@global.table_open_cache  = 64;
-@@global.table_open_cache  = 64
+SELECT @@global.table_open_cache  = 400;
+@@global.table_open_cache  = 400
 1
 '#--------------------FN_DYNVARS_001_03------------------------#'
 SET @@global.table_open_cache  = 8;
@@ -105,4 +105,4 @@ 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
-64
+400
diff --git a/mysql-test/t/table_definition_cache_basic.test b/mysql-test/t/table_definition_cache_basic.test
index 63296590511..741079091bc 100644
--- a/mysql-test/t/table_definition_cache_basic.test
+++ b/mysql-test/t/table_definition_cache_basic.test
@@ -4,7 +4,7 @@
 # Scope: GLOBAL                                                                #
 # Access Type: Dynamic                                                         #
 # Data Type: Numeric                                                           #
-# Default Value: 128                                                           #
+# Default Value: 400                                                           #
 # Range: 1 - 524288                                                            #
 #                                                                              #
 #                                                                              #
@@ -52,7 +52,7 @@ SELECT @@global.table_definition_cache;
 ###############################################
 
 SET @@global.table_definition_cache = DEFAULT;
-SELECT @@global.table_definition_cache = 128;
+SELECT @@global.table_definition_cache = 400;
 
 
 --echo '#--------------------FN_DYNVARS_019_03------------------------#'
diff --git a/mysql-test/t/table_open_cache_basic.test b/mysql-test/t/table_open_cache_basic.test
index 23f60bde00a..c32463ca030 100644
--- a/mysql-test/t/table_open_cache_basic.test
+++ b/mysql-test/t/table_open_cache_basic.test
@@ -4,8 +4,8 @@
 # Scope: GLOBAL                                                               #
 # Access Type: Dynamic                                                        #
 # Data Type: numeric                                                          #
-# Default Value: 64                                                           #
-# Range: 1-524288                                                             #
+# Default Value: 400                                                         #
+# Range: 64-524288                                                             #
 #                                                                             #
 #                                                                             #
 # Creation Date: 2008-02-13                                                   #
@@ -54,7 +54,7 @@ SELECT @@global.table_open_cache;
 ############################################### 
 
 SET @@global.table_open_cache = Default;
-SELECT @@global.table_open_cache  = 64;
+SELECT @@global.table_open_cache  = 400;
 
 --echo '#--------------------FN_DYNVARS_001_03------------------------#'
 ######################################################################## 
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h
index 7028817259d..13338e34ddb 100644
--- a/sql/mysql_priv.h
+++ b/sql/mysql_priv.h
@@ -260,8 +260,8 @@ protected:
 #define MAX_FIELDS_BEFORE_HASH	32
 #define USER_VARS_HASH_SIZE     16
 #define TABLE_OPEN_CACHE_MIN    64
-#define TABLE_OPEN_CACHE_DEFAULT 1024
-#define TABLE_DEF_CACHE_DEFAULT 1024
+#define TABLE_OPEN_CACHE_DEFAULT 400
+#define TABLE_DEF_CACHE_DEFAULT 400
 /**
   We must have room for at least 256 table definitions in the table
   cache, since otherwise there is no chance prepared