From 01b100b5dd3040daa18791abb88a9ffef06efe67 Mon Sep 17 00:00:00 2001 From: Michael Widenius Date: Wed, 8 Sep 2010 02:00:12 +0300 Subject: [PATCH] Give a more precise warning why something fails. Fixed typo that caused warnings from mysql-test-run mysql-test/mysql-test-run.pl: Fixed typo sql/mysqld.cc: Give a more precise warning why something fails. --- mysql-test/mysql-test-run.pl | 2 +- sql/mysqld.cc | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 51ef20c3cfd..eb1fad0bbb2 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -4228,7 +4228,7 @@ sub extract_warning_lines ($) { qr/slave SQL thread aborted/, qr/unknown option '--loose[-_]/, qr/unknown variable 'loose[-_]/, - or/Invalid .*old.* table or database name/, + qr/Invalid .*old.* table or database name/, qr/Now setting lower_case_table_names to [02]/, qr/Setting lower_case_table_names=2/, qr/You have forced lower_case_table_names to 0/, diff --git a/sql/mysqld.cc b/sql/mysqld.cc index a03e5941558..1218ee666e1 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -8786,8 +8786,7 @@ mysqld_get_one_option(int optid, if (!slave_warning_issued) //only show the warning once { slave_warning_issued = true; - WARN_DEPRECATED(NULL, "6.0", "for replication startup options", - "'CHANGE MASTER'"); + WARN_DEPRECATED(NULL, "6.0", opt->name, "'CHANGE MASTER'"); } break; case OPT_CONSOLE: