From a369d070ff491d5d4fffc31442d5ec0b7543cf58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20van=20Eeden?= Date: Wed, 3 Dec 2014 08:31:00 +0100 Subject: [PATCH] Update message as table_cache is deprecated. --- mysql-test/include/mtr_warnings.sql | 2 +- sql/mysqld.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mysql-test/include/mtr_warnings.sql b/mysql-test/include/mtr_warnings.sql index 9de3058..8d8efa9 100644 --- a/mysql-test/include/mtr_warnings.sql +++ b/mysql-test/include/mtr_warnings.sql @@ -243,7 +243,7 @@ INSERT INTO global_suppressions VALUES ("Changed limits: max_open_files: *"), ("Changed limits: max_connections: *"), - ("Changed limits: table_cache: *"), + ("Changed limits: table_open_cache: *"), ("Could not increase number of max_open_files to more than *"), ("THE_LAST_SUPPRESSION")|| diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 25102e1..a6f02e3 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -6935,7 +6935,7 @@ void adjust_table_cache_size(ulong requested_open_files) char msg[1024]; snprintf(msg, sizeof(msg), - "Changed limits: table_cache: %lu (requested %lu)", + "Changed limits: table_open_cache: %lu (requested %lu)", limit, table_cache_size); buffered_logs.buffer(WARNING_LEVEL, msg); -- 2.1.0