database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

MDEV-6066: Merge new defaults from 5.6 and 5.7

Browse Source 
cosmetic fixes. test fixes.
This commit is contained in:
Sergei Golubchik
2015-09-03 18:06:55 +02:00
parent e3982cead2
commit bc12d5fd43
20 changed files with 81 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mysys/my_getopt.c
View File

@ -55,7 +55,7 @@ enum enum_special_opt
char *disabled_my_option= (char*) "0";
char *enabled_my_option= (char*) "1";
char *autoset_my_option= (char*) "";
char *autoset_my_option= (char*) "auto";
/*
This is a flag that can be set in client programs. 0 means that
@ -467,7 +467,7 @@ int handle_options(int *argc, char ***argv,
if (optend)
{
my_getopt_error_reporter(ERROR_LEVEL,
"%s: automatic setup request of "
"%s: automatically set "
"option '--%s' cannot take an argument",
my_progname, optp->name);