Bug#19285052 - warning message shows old variable name.

Description:
-------------
Old name "table_cache" for system variable "table_size_cache"
is still used as part of strings in few places. Changed them to
"table_cache_size" in this patch.

Author: phulakun

mysql-test/include/mtr_warnings.sql

@@ -238,7 +238,7 @@ INSERT INTO global_suppressions VALUES
 
  ("Changed limits: max_open_files: *"),
  ("Changed limits: max_connections: *"),
- ("Changed limits: table_cache: *"),
+ ("Changed limits: table_cache_size: *"),
  ("Could not increase number of max_open_files to more than *"),
 
  ("THE_LAST_SUPPRESSION")||

mysql-test/r/mysqld--help-notwin.result

@@ -533,8 +533,8 @@ The following options may be given as the first argument:
  If this is not 0, then mysqld will use this value to
  reserve file descriptors to use with setrlimit(). If this
  value is 0 then mysqld will reserve max_connections*5 or
- max_connections + table_cache*2 (whichever is larger)
- number of file descriptors
+ max_connections + table_cache_size*2 (whichever is
+ larger) number of file descriptors
  --optimizer-prune-level=# 
  Controls the heuristic(s) applied during query
  optimization to prune less-promising partial plans from

mysql-test/r/mysqld--help-win.result

@@ -525,8 +525,8 @@ The following options may be given as the first argument:
  If this is not 0, then mysqld will use this value to
  reserve file descriptors to use with setrlimit(). If this
  value is 0 then mysqld will reserve max_connections*5 or
- max_connections + table_cache*2 (whichever is larger)
- number of file descriptors
+ max_connections + table_cache_size*2 (whichever is
+ larger) number of file descriptors
  --optimizer-prune-level=# 
  Controls the heuristic(s) applied during query
  optimization to prune less-promising partial plans from

mysql-test/t/m_i_db_createschema.sql

@@ -246,7 +246,7 @@ INSERT INTO global_suppressions VALUES
 
  ("Changed limits: max_open_files: *"),
  ("Changed limits: max_connections: *"),
- ("Changed limits: table_cache: *"),
+ ("Changed limits: table_cache_size: *"),
  ("Could not increase number of max_open_files to more than *"),
 
  ("THE_LAST_SUPPRESSION")||

sql/mysqld.cc

@@ -5228,7 +5228,7 @@ void adjust_table_cache_size(ulong requested_open_files)
     char msg[1024];
 
     my_snprintf(msg, sizeof(msg),
-                "Changed limits: table_cache: %lu (requested %lu)",
+                "Changed limits: table_cache_size: %lu (requested %lu)",
                 limit, table_cache_size);
     buffered_logs.buffer(WARNING_LEVEL, msg);
 

sql/sys_vars.cc

@@ -2393,7 +2393,7 @@ static Sys_var_ulong Sys_open_files_limit(
        "open_files_limit",
        "If this is not 0, then mysqld will use this value to reserve file "
        "descriptors to use with setrlimit(). If this value is 0 then mysqld "
-       "will reserve max_connections*5 or max_connections + table_cache*2 "
+       "will reserve max_connections*5 or max_connections + table_cache_size*2 "
        "(whichever is larger) number of file descriptors",
        READ_ONLY GLOBAL_VAR(open_files_limit), CMD_LINE(REQUIRED_ARG),
        VALID_RANGE(0, OS_FILE_LIMIT), DEFAULT(0), BLOCK_SIZE(1),