diff options
author | unknown <monty@hundin.mysql.fi> | 2002-09-27 12:13:28 +0300 |
---|---|---|
committer | unknown <monty@hundin.mysql.fi> | 2002-09-27 12:13:28 +0300 |
commit | 08d18a45fdb71dfa6535b32eb5e3d0e25466bbeb (patch) | |
tree | 141be8efaead2e8f2d5734f1dd852b64e9da8388 /sql | |
parent | edd6449ed8cff4f79149d832da36b82b7fe4f781 (diff) | |
parent | 9dd4e2b2449021c7f635599920263db3ec4bf4d5 (diff) | |
download | mariadb-git-08d18a45fdb71dfa6535b32eb5e3d0e25466bbeb.tar.gz |
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
Diffstat (limited to 'sql')
-rw-r--r-- | sql/mysqld.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 7af4573d50a..c418ef34174 100644 --- a/sql/mysqld.cc +++ b/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}, |