summaryrefslogtreecommitdiff
path: root/extra/my_print_defaults.c
diff options
context:
space:
mode:
authorunknown <monty@donna.mysql.com>2000-12-16 01:17:13 +0200
committerunknown <monty@donna.mysql.com>2000-12-16 01:17:13 +0200
commit587387f5d0af6a4381c99bc3da4f87bae63f5cef (patch)
tree14bcbe3d9fe5425348e6a65b38a4201b7c314815 /extra/my_print_defaults.c
parent68d0f88c5e85c412ba2539e7e107a6de54e03af5 (diff)
downloadmariadb-git-587387f5d0af6a4381c99bc3da4f87bae63f5cef.tar.gz
Configure updates
Fixed my_print_defaults --no-defaults Docs/manual.texi: Updated changelog acinclude.m4: Patches for large file support configure.in: New TCP libwrap extra/my_print_defaults.c: Fixed that --no-defaults include/my_pthread.h: Fixes for Tru64 ltconfig: Fixes for Tru64 ltmain.sh: Fixes for Tru64 mysql-test/README: Fixed types mysql-test/mysql-test-run.sh: Changed to long options
Diffstat (limited to 'extra/my_print_defaults.c')
-rw-r--r--extra/my_print_defaults.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/extra/my_print_defaults.c b/extra/my_print_defaults.c
index ad15793617b..316d91ef7b3 100644
--- a/extra/my_print_defaults.c
+++ b/extra/my_print_defaults.c
@@ -34,7 +34,7 @@ static struct option long_options[] =
{"defaults-file", required_argument, 0, 'c'},
{"defaults-extra-file", required_argument, 0, 'e'},
{"extra-file", required_argument, 0, 'e'},
- {"no-defaults", no_argument, 0, 'd'},
+ {"no-defaults", no_argument, 0, 'n'},
{"help", no_argument, 0, '?'},
{"version", no_argument, 0, 'V'},
{0, 0, 0, 0}
@@ -42,7 +42,7 @@ static struct option long_options[] =
static void usage(my_bool version)
{
- printf("%s Ver 1.2 for %s at %s\n",my_progname,SYSTEM_TYPE,
+ printf("%s Ver 1.3 for %s at %s\n",my_progname,SYSTEM_TYPE,
MACHINE_TYPE);
if (version)
return;
@@ -55,7 +55,7 @@ static void usage(my_bool version)
-e, --extra-file=#, --defaults-extra-file=#\n\
Read this file after the global /etc config file and\n\
before the config file in the users home directory.\n\
- --no-defaults Return an empty string (useful for scripts)\n\
+ -n, --no-defaults Return an empty string (useful for scripts)\n\
-?, --help Display this help message and exit.\n\
-V, --version Output version information and exit.\n",
config_file);
@@ -66,7 +66,7 @@ static int get_options(int *argc,char ***argv)
{
int c,option_index;
- while ((c=getopt_long(*argc,*argv,"c:e:V?I",
+ while ((c=getopt_long(*argc,*argv,"nc:e:V?I",
long_options, &option_index)) != EOF)
{
switch (c) {