Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0

include/my_getopt.h

@@ -42,7 +42,6 @@ struct my_option
   longlong   sub_size;                  /* Subtract this from given value */
   long       block_size;                /* Value should be a mult. of this */
   int        app_type;                  /* To be used by an application */
-  my_bool    opt_is_var;                /* If true, the option is a variable */
 };
 
 extern int handle_options (int *argc, char ***argv, 
@@ -50,3 +49,5 @@ extern int handle_options (int *argc, char ***argv,
 			   my_bool (*get_one_option)(int,
 						     const struct my_option *,
 						     char *));
+extern void my_print_help(const struct my_option *options);
+extern void my_print_variables(const struct my_option *options);

support-files/my-huge.cnf.sh

@@ -4,7 +4,7 @@
 # MySQL.
 #
 # You can copy this file to
-# /etc/mf.cnf to set global options,
+# /etc/my.cnf to set global options,
 # mysql-data-dir/my.cnf to set server-specific options (in this
 # installation this directory is @localstatedir@) or
 # ~/.my.cnf to set user-specific options.

support-files/my-large.cnf.sh

@@ -4,7 +4,7 @@
 # MySQL.
 #
 # You can copy this file to
-# /etc/mf.cnf to set global options,
+# /etc/my.cnf to set global options,
 # mysql-data-dir/my.cnf to set server-specific options (in this
 # installation this directory is @localstatedir@) or
 # ~/.my.cnf to set user-specific options.

support-files/my-medium.cnf.sh

@@ -5,7 +5,7 @@
 # other programs (like a web server)
 #
 # You can copy this file to
-# /etc/mf.cnf to set global options,
+# /etc/my.cnf to set global options,
 # mysql-data-dir/my.cnf to set server-specific options (in this
 # installation this directory is @localstatedir@) or
 # ~/.my.cnf to set user-specific options.

support-files/my-small.cnf.sh

@@ -5,7 +5,7 @@
 # doesn't use much resources.
 #
 # You can copy this file to
-# /etc/mf.cnf to set global options,
+# /etc/my.cnf to set global options,
 # mysql-data-dir/my.cnf to set server-specific options (in this
 # installation this directory is @localstatedir@) or
 # ~/.my.cnf to set user-specific options.