diff options
| author | Michael Widenius <monty@askmonty.org> | 2012-09-07 17:05:17 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2012-09-07 17:05:17 +0300 |
| commit | 2fc4c75194c1c6cc432d847ed47ef73298ff4c7f (patch) | |
| tree | 848c528def6c3777fc0efd5be13ab6f3f491f4af /sql/derror.cc | |
| parent | d618dfe32dfe004f3bfd6aa79a4fb96d1cc7999d (diff) | |
| download | mariadb-git-2fc4c75194c1c6cc432d847ed47ef73298ff4c7f.tar.gz | |
Better error message when using --language or --log-bin
Simplify code
sql/derror.cc:
Better error message
sql/mysqld.cc:
Simplify usage of lc_messages_dir_ptr.
Don't give warnings that --log-bin should be used if --log-bin or --skip-log-bin is used.
Diffstat (limited to 'sql/derror.cc')
| -rw-r--r-- | sql/derror.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/derror.cc b/sql/derror.cc index baf7163790d..33835992258 100644 --- a/sql/derror.cc +++ b/sql/derror.cc @@ -177,8 +177,8 @@ bool read_texts(const char *file_name, const char *language, O_RDONLY | O_SHARE | O_BINARY, MYF(0))) < 0) goto err; - sql_print_error("An old style --language value with language specific part detected: %s", lc_messages_dir); - sql_print_error("Use --lc-messages-dir without language specific part instead."); + sql_print_warning("An old style --language or -lc-message-dir value with language specific part detected: %s", lc_messages_dir); + sql_print_warning("Use --lc-messages-dir without language specific part instead."); } funktpos=1; |