merged configuration changes

sql/mysql_priv.h

@@ -260,8 +260,8 @@ class Default_object_creation_ctx : public Object_creation_ctx
 #define MAX_FIELDS_BEFORE_HASH	32
 #define USER_VARS_HASH_SIZE     16
 #define TABLE_OPEN_CACHE_MIN    64
-#define TABLE_OPEN_CACHE_DEFAULT 64
-#define TABLE_DEF_CACHE_DEFAULT 256
+#define TABLE_OPEN_CACHE_DEFAULT 1024
+#define TABLE_DEF_CACHE_DEFAULT 1024
 /**
   We must have room for at least 256 table definitions in the table
   cache, since otherwise there is no chance prepared

storage/innobase/handler/ha_innodb.cc

@@ -8161,7 +8161,7 @@ static MYSQL_SYSVAR_ULONG(sync_spin_loops, srv_n_spin_wait_rounds,
 static MYSQL_SYSVAR_ULONG(thread_concurrency, srv_thread_concurrency,
   PLUGIN_VAR_RQCMDARG,
   "Helps in performance tuning in heavily concurrent environments. Sets the maximum number of threads allowed inside InnoDB. Value 0 will disable the thread throttling.",
-  NULL, NULL, 8, 0, 1000, 0);
+  NULL, NULL, 0, 0, 1000, 0);
 
 static MYSQL_SYSVAR_ULONG(thread_sleep_delay, srv_thread_sleep_delay,
   PLUGIN_VAR_RQCMDARG,