1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Better error message when using --language or --log-bin

Browse Source 
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.
This commit is contained in:
Michael Widenius 2012-09-07 17:05:17 +03:00
parent d618dfe32d
commit 2fc4c75194
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sql/derror.cc
View File

@ -177,8 +177,8 @@ bool read_texts(const char *file_name, const char *language,
O_RDONLY | O_SHARE | O_BINARY, O_RDONLY | O_SHARE | O_BINARY,
MYF(0))) < 0) MYF(0))) < 0)
goto err; goto err;
sql_print_error("An old style --language value with language specific part detected: %s", lc_messages_dir); sql_print_warning("An old style --language or -lc-message-dir 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("Use --lc-messages-dir without language specific part instead.");
} }
funktpos=1; funktpos=1;

18
sql/mysqld.cc
View File

@ -360,7 +360,7 @@ static DYNAMIC_ARRAY all_options;
/* Global variables */ /* Global variables */
bool opt_bin_log, opt_ignore_builtin_innodb= 0; bool opt_bin_log, opt_bin_log_used=0, opt_ignore_builtin_innodb= 0;
my_bool opt_log, opt_slow_log, debug_assert_if_crashed_table= 0, opt_help= 0, opt_abort; my_bool opt_log, opt_slow_log, debug_assert_if_crashed_table= 0, opt_help= 0, opt_abort;
ulonglong log_output_options; ulonglong log_output_options;
my_bool opt_userstat_running; my_bool opt_userstat_running;
@ -579,7 +579,7 @@ char mysql_real_data_home[FN_REFLEN],
lc_messages_dir[FN_REFLEN], reg_ext[FN_EXTLEN], lc_messages_dir[FN_REFLEN], reg_ext[FN_EXTLEN],
mysql_charsets_dir[FN_REFLEN], mysql_charsets_dir[FN_REFLEN],
*opt_init_file, *opt_tc_log_file; *opt_init_file, *opt_tc_log_file;
char *lc_messages_dir_ptr, *log_error_file_ptr; char *lc_messages_dir_ptr= lc_messages_dir, *log_error_file_ptr;
char mysql_unpacked_real_data_home[FN_REFLEN]; char mysql_unpacked_real_data_home[FN_REFLEN];
int mysql_unpacked_real_data_home_len; int mysql_unpacked_real_data_home_len;
uint mysql_real_data_home_len, mysql_data_home_len= 1; uint mysql_real_data_home_len, mysql_data_home_len= 1;
@ -4172,14 +4172,15 @@ static int init_server_components()
unireg_abort(1); unireg_abort(1);
/* need to configure logging before initializing storage engines */ /* need to configure logging before initializing storage engines */
if (opt_log_slave_updates && !opt_bin_log) if (!opt_bin_log_used)
{ {
if (opt_log_slave_updates)
sql_print_warning("You need to use --log-bin to make " sql_print_warning("You need to use --log-bin to make "
"--log-slave-updates work."); "--log-slave-updates work.");
} if (binlog_format_used)
if (!opt_bin_log && binlog_format_used)
sql_print_warning("You need to use --log-bin to make " sql_print_warning("You need to use --log-bin to make "
"--binlog-format work."); "--binlog-format work.");
}
/* Check that we have not let the format to unspecified at this point */ /* Check that we have not let the format to unspecified at this point */
DBUG_ASSERT((uint)global_system_variables.binlog_format <= DBUG_ASSERT((uint)global_system_variables.binlog_format <=
@ -6226,7 +6227,7 @@ struct my_option my_long_options[]=
{"language", 'L', {"language", 'L',
"Client error messages in given language. May be given as a full path. " "Client error messages in given language. May be given as a full path. "
"Deprecated. Use --lc-messages-dir instead.", "Deprecated. Use --lc-messages-dir instead.",
&lc_messages_dir_ptr, &lc_messages_dir_ptr, 0, 0, 0, 0,
GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
{"lc-messages", 0, {"lc-messages", 0,
"Set the language used for the error messages.", "Set the language used for the error messages.",
@ -7218,7 +7219,7 @@ static int mysql_init_variables(void)
myisam_test_invalid_symlink= test_if_data_home_dir; myisam_test_invalid_symlink= test_if_data_home_dir;
#endif #endif
opt_log= opt_slow_log= 0; opt_log= opt_slow_log= 0;
opt_bin_log= 0; opt_bin_log= opt_bin_log_used= 0;
opt_disable_networking= opt_skip_show_db=0; opt_disable_networking= opt_skip_show_db=0;
opt_skip_name_resolve= 0; opt_skip_name_resolve= 0;
opt_ignore_builtin_innodb= 0; opt_ignore_builtin_innodb= 0;
@ -7270,7 +7271,6 @@ static int mysql_init_variables(void)
mysql_home_ptr= mysql_home; mysql_home_ptr= mysql_home;
pidfile_name_ptr= pidfile_name; pidfile_name_ptr= pidfile_name;
log_error_file_ptr= log_error_file; log_error_file_ptr= log_error_file;
lc_messages_dir_ptr= lc_messages_dir;
protocol_version= PROTOCOL_VERSION; protocol_version= PROTOCOL_VERSION;
what_to_log= ~ (1L << (uint) COM_TIME); what_to_log= ~ (1L << (uint) COM_TIME);
refresh_version= 1L; /* Increments on each reload */ refresh_version= 1L; /* Increments on each reload */
@ -7459,7 +7459,6 @@ mysqld_get_one_option(int optid,
break; break;
case 'L': case 'L':
strmake(lc_messages_dir, argument, sizeof(lc_messages_dir)-1); strmake(lc_messages_dir, argument, sizeof(lc_messages_dir)-1);
lc_messages_dir_ptr= lc_messages_dir;
break; break;
case OPT_BINLOG_FORMAT: case OPT_BINLOG_FORMAT:
binlog_format_used= true; binlog_format_used= true;
@ -7488,6 +7487,7 @@ mysqld_get_one_option(int optid,
break; break;
case (int) OPT_BIN_LOG: case (int) OPT_BIN_LOG:
opt_bin_log= test(argument != disabled_my_option); opt_bin_log= test(argument != disabled_my_option);
opt_bin_log_used= 1;
break; break;
case (int) OPT_LOG_BASENAME: case (int) OPT_LOG_BASENAME:
{ {