Skip to content

Commit b744df5

Browse files
committed
Bug#19285052 - warning message shows old variable name.
Description: ------------- Follow up patch for this bug. Old name "table_cache" for system variable "table_open_cache" is still used as part of strings in few places. Changed them to "table_open_cache" in this patch.
1 parent c60ac30 commit b744df5

File tree

6 files changed

+6
-6
lines changed

6 files changed

+6
-6
lines changed

mysql-test/include/mtr_warnings.sql

+1-1
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ INSERT INTO global_suppressions VALUES
238238

239239
("Changed limits: max_open_files: *"),
240240
("Changed limits: max_connections: *"),
241-
("Changed limits: table_cache_size: *"),
241+
("Changed limits: table_open_cache: *"),
242242
("Could not increase number of max_open_files to more than *"),
243243

244244
("THE_LAST_SUPPRESSION")||

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -528,7 +528,7 @@ The following options may be given as the first argument:
528528
If this is not 0, then mysqld will use this value to
529529
reserve file descriptors to use with setrlimit(). If this
530530
value is 0 then mysqld will reserve max_connections*5 or
531-
max_connections + table_cache_size*2 (whichever is
531+
max_connections + table_open_cache*2 (whichever is
532532
larger) number of file descriptors
533533
--optimizer-prune-level=#
534534
Controls the heuristic(s) applied during query

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -520,7 +520,7 @@ The following options may be given as the first argument:
520520
If this is not 0, then mysqld will use this value to
521521
reserve file descriptors to use with setrlimit(). If this
522522
value is 0 then mysqld will reserve max_connections*5 or
523-
max_connections + table_cache_size*2 (whichever is
523+
max_connections + table_open_cache*2 (whichever is
524524
larger) number of file descriptors
525525
--optimizer-prune-level=#
526526
Controls the heuristic(s) applied during query

mysql-test/t/m_i_db_createschema.sql

+1-1
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ INSERT INTO global_suppressions VALUES
246246

247247
("Changed limits: max_open_files: *"),
248248
("Changed limits: max_connections: *"),
249-
("Changed limits: table_cache_size: *"),
249+
("Changed limits: table_open_cache: *"),
250250
("Could not increase number of max_open_files to more than *"),
251251

252252
("THE_LAST_SUPPRESSION")||

sql/mysqld.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -5227,7 +5227,7 @@ void adjust_table_cache_size(ulong requested_open_files)
52275227
char msg[1024];
52285228

52295229
my_snprintf(msg, sizeof(msg),
5230-
"Changed limits: table_cache_size: %lu (requested %lu)",
5230+
"Changed limits: table_open_cache: %lu (requested %lu)",
52315231
limit, table_cache_size);
52325232
buffered_logs.buffer(WARNING_LEVEL, msg);
52335233

sql/sys_vars.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -2383,7 +2383,7 @@ static Sys_var_ulong Sys_open_files_limit(
23832383
"open_files_limit",
23842384
"If this is not 0, then mysqld will use this value to reserve file "
23852385
"descriptors to use with setrlimit(). If this value is 0 then mysqld "
2386-
"will reserve max_connections*5 or max_connections + table_cache_size*2 "
2386+
"will reserve max_connections*5 or max_connections + table_open_cache*2 "
23872387
"(whichever is larger) number of file descriptors",
23882388
READ_ONLY GLOBAL_VAR(open_files_limit), CMD_LINE(REQUIRED_ARG),
23892389
VALID_RANGE(0, OS_FILE_LIMIT), DEFAULT(0), BLOCK_SIZE(1),

0 commit comments

Comments
 (0)