Merge hundin.mysql.fi:/my/mysql-3.23

into hundin.mysql.fi:/my/bk/mysql-4.0


configure.in:
  Auto merged
BitKeeper/deleted/.del-global.h~e80d28157acfdcb5:
  Auto merged
Docs/manual.texi:
  Auto merged
client/mysqlbinlog.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged

Docs/manual.texi

@@ -51054,6 +51054,8 @@ not yet 100% confident in this code.
 @appendixsubsec Changes in release 3.23.53
 @itemize @bullet
 @item
+Fixed that @code{SHOW STATUS} doesn't reset @code{Delayed_insert_threads}.
+@item
 Fixed core dump bug when using the @code{BINARY} cast on a @code{NULL} value.
 @item
 Fixed race condition when someone did a @code{GRANT} at the same time a new

sql/mysqld.cc

@@ -3736,7 +3736,7 @@ struct show_var_st status_vars[]= {
   {"Created_tmp_disk_tables",  (char*) &created_tmp_disk_tables,SHOW_LONG},
   {"Created_tmp_tables",       (char*) &created_tmp_tables,     SHOW_LONG},
   {"Created_tmp_files",	       (char*) &my_tmp_file_created,	SHOW_LONG},
-  {"Delayed_insert_threads",   (char*) &delayed_insert_threads, SHOW_LONG},
+  {"Delayed_insert_threads",   (char*) &delayed_insert_threads, SHOW_LONG_CONST},
   {"Delayed_writes",           (char*) &delayed_insert_writes,  SHOW_LONG},
   {"Delayed_errors",           (char*) &delayed_insert_errors,  SHOW_LONG},
   {"Flush_commands",           (char*) &refresh_version,        SHOW_LONG_CONST},