mirror of
https://github.com/MariaDB/server.git
synced 2025-02-01 03:21:53 +01:00
reformat long strings
(to help 'git diff' show the correct function for hunks)
This commit is contained in:
parent
6c55e52b10
commit
91f8931e45
1 changed files with 31 additions and 31 deletions
|
@ -4338,11 +4338,12 @@ static int init_common_variables()
|
||||||
if (lower_case_table_names_used)
|
if (lower_case_table_names_used)
|
||||||
{
|
{
|
||||||
if (global_system_variables.log_warnings)
|
if (global_system_variables.log_warnings)
|
||||||
sql_print_warning("\
|
sql_print_warning("You have forced lower_case_table_names to 0 through "
|
||||||
You have forced lower_case_table_names to 0 through a command-line \
|
"a command-line option, even though your file system "
|
||||||
option, even though your file system '%s' is case insensitive. This means \
|
"'%s' is case insensitive. This means that you can "
|
||||||
that you can corrupt a MyISAM table by accessing it with different cases. \
|
"corrupt a MyISAM table by accessing it with "
|
||||||
You should consider changing lower_case_table_names to 1 or 2",
|
"different cases. You should consider changing "
|
||||||
|
"lower_case_table_names to 1 or 2",
|
||||||
mysql_real_data_home);
|
mysql_real_data_home);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
@ -4738,15 +4739,16 @@ static int init_server_components()
|
||||||
{
|
{
|
||||||
if (opt_bin_log)
|
if (opt_bin_log)
|
||||||
{
|
{
|
||||||
sql_print_error("using --replicate-same-server-id in conjunction with \
|
sql_print_error("using --replicate-same-server-id in conjunction with "
|
||||||
--log-slave-updates is impossible, it would lead to infinite loops in this \
|
"--log-slave-updates is impossible, it would lead to "
|
||||||
server.");
|
"infinite loops in this server.");
|
||||||
unireg_abort(1);
|
unireg_abort(1);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
sql_print_warning("using --replicate-same-server-id in conjunction with \
|
sql_print_warning("using --replicate-same-server-id in conjunction with "
|
||||||
--log-slave-updates would lead to infinite loops in this server. However this \
|
"--log-slave-updates would lead to infinite loops in "
|
||||||
will be ignored as the --log-bin option is not defined.");
|
"this server. However this will be ignored as the "
|
||||||
|
"--log-bin option is not defined.");
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -4759,8 +4761,8 @@ will be ignored as the --log-bin option is not defined.");
|
||||||
if (opt_bin_logname[0] &&
|
if (opt_bin_logname[0] &&
|
||||||
opt_bin_logname[strlen(opt_bin_logname) - 1] == FN_LIBCHAR)
|
opt_bin_logname[strlen(opt_bin_logname) - 1] == FN_LIBCHAR)
|
||||||
{
|
{
|
||||||
sql_print_error("Path '%s' is a directory name, please specify \
|
sql_print_error("Path '%s' is a directory name, please specify "
|
||||||
a file name for --log-bin option", opt_bin_logname);
|
"a file name for --log-bin option", opt_bin_logname);
|
||||||
unireg_abort(1);
|
unireg_abort(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -4770,8 +4772,9 @@ a file name for --log-bin option", opt_bin_logname);
|
||||||
opt_binlog_index_name[strlen(opt_binlog_index_name) - 1]
|
opt_binlog_index_name[strlen(opt_binlog_index_name) - 1]
|
||||||
== FN_LIBCHAR)
|
== FN_LIBCHAR)
|
||||||
{
|
{
|
||||||
sql_print_error("Path '%s' is a directory name, please specify \
|
sql_print_error("Path '%s' is a directory name, please specify "
|
||||||
a file name for --log-bin-index option", opt_binlog_index_name);
|
"a file name for --log-bin-index option",
|
||||||
|
opt_binlog_index_name);
|
||||||
unireg_abort(1);
|
unireg_abort(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -8080,16 +8083,15 @@ static void usage(void)
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
#ifdef __WIN__
|
#ifdef __WIN__
|
||||||
puts("NT and Win32 specific options:\n\
|
puts("NT and Win32 specific options:\n"
|
||||||
--install Install the default service (NT).\n\
|
" --install Install the default service (NT).\n"
|
||||||
--install-manual Install the default service started manually (NT).\n\
|
" --install-manual Install the default service started manually (NT).\n"
|
||||||
--install service_name Install an optional service (NT).\n\
|
" --install service_name Install an optional service (NT).\n"
|
||||||
--install-manual service_name Install an optional service started manually (NT).\n\
|
" --install-manual service_name Install an optional service started manually (NT).\n"
|
||||||
--remove Remove the default service from the service list (NT).\n\
|
" --remove Remove the default service from the service list (NT).\n"
|
||||||
--remove service_name Remove the service_name from the service list (NT).\n\
|
" --remove service_name Remove the service_name from the service list (NT).\n"
|
||||||
--enable-named-pipe Only to be used for the default server (NT).\n\
|
" --enable-named-pipe Only to be used for the default server (NT).\n"
|
||||||
--standalone Dummy option to start as a standalone server (NT).\
|
" --standalone Dummy option to start as a standalone server (NT).");
|
||||||
");
|
|
||||||
puts("");
|
puts("");
|
||||||
#endif
|
#endif
|
||||||
print_defaults(MYSQL_CONFIG_NAME,load_default_groups);
|
print_defaults(MYSQL_CONFIG_NAME,load_default_groups);
|
||||||
|
@ -8101,14 +8103,12 @@ static void usage(void)
|
||||||
|
|
||||||
if (! plugins_are_initialized)
|
if (! plugins_are_initialized)
|
||||||
{
|
{
|
||||||
puts("\n\
|
puts("\nPlugins have parameters that are not reflected in this list"
|
||||||
Plugins have parameters that are not reflected in this list\n\
|
"\nbecause execution stopped before plugins were initialized.");
|
||||||
because execution stopped before plugins were initialized.");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
puts("\n\
|
puts("\nTo see what values a running MySQL server is using, type"
|
||||||
To see what values a running MySQL server is using, type\n\
|
"\n'mysqladmin variables' instead of 'mysqld --verbose --help'.");
|
||||||
'mysqladmin variables' instead of 'mysqld --verbose --help'.");
|
|
||||||
}
|
}
|
||||||
DBUG_VOID_RETURN;
|
DBUG_VOID_RETURN;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue