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

BitKeeper/etc/logging_ok:
  auto-union
sql/ha_innodb.cc:
  Auto merged

BitKeeper/etc/logging_ok

@@ -14,6 +14,7 @@ bell@sanja.is.com.ua
 davida@isil.mysql.com
 heikki@donna.mysql.fi
 heikki@hundin.mysql.fi
+heikki@rescue.
 heikki@work.mysql.com
 jani@dsl-jkl1657.dial.inet.fi
 jani@hynda.(none)

Docs/manual.texi

@@ -50386,6 +50386,10 @@ each individual 4.0.x release.
 
 @itemize @bullet
 @item
+Fixed a bug in my_getopt; --set-variable syntax didn't work for
+those options that didn't have a valid variable in my_option struct.
+This affected at least @code{default-table-type} option.
+@item
 Fixed a bug that caused @code{REPAIR TABLE} to fail on tables
 with duplicates in a unique key.
 @item

mysys/my_getopt.c

@@ -275,7 +275,7 @@ int handle_options(int *argc, char ***argv,
 	    return EXIT_AMBIGUOUS_OPTION;
 	  }
 	}
-	if (must_be_var && !optp->value)
+	if (must_be_var && optp->var_type == GET_NO_ARG)
 	{
 	  if (my_getopt_print_errors)
 	    fprintf(stderr, "%s: option '%s' cannot take an argument\n",

sql/mysqld.cc

@@ -3000,7 +3000,7 @@ struct my_option my_long_options[] =
    REQUIRED_ARG, 0, 0, 0, 0, 0, 0 },
   {"default-table-type", OPT_TABLE_TYPE,
    "Set the default table type for tables", 0, 0,
-   0, GET_NO_ARG, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
+   0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
   {"delay-key-write", OPT_DELAY_KEY_WRITE, "Type of DELAY_KEY_WRITE",
    0,0,0, GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0},
   {"delay-key-write-for-all-tables", OPT_DELAY_KEY_WRITE_ALL,