diff options
| author | unknown <sergefp@mysql.com> | 2005-05-26 21:01:53 +0200 |
|---|---|---|
| committer | unknown <sergefp@mysql.com> | 2005-05-26 21:01:53 +0200 |
| commit | 598b7631cd2fccf315ca28cc372d07a2a5c8ecbb (patch) | |
| tree | aa1d5fa63a6ba1a39d06e35d826b5a7407facfb5 /sql/mysqld.cc | |
| parent | e3beea23a0f202866c293947a74fc6df092e5763 (diff) | |
| parent | 48e0630d2f71b47a12ef85124bba570d73ff7b65 (diff) | |
| download | mariadb-git-598b7631cd2fccf315ca28cc372d07a2a5c8ecbb.tar.gz | |
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/psergey/mysql-5.0-conf-fixes-2
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/structs.h:
Auto merged
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 8c5ce22f7a6..5254214c992 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -368,7 +368,6 @@ ulong thread_id=1L,current_pid; ulong slow_launch_threads = 0, sync_binlog_period; ulong expire_logs_days = 0; ulong rpl_recovery_rank=0; -double last_query_cost= -1; /* -1 denotes that no query was compiled yet */ double log_10[32]; /* 10 potences */ time_t start_time; @@ -5727,7 +5726,7 @@ struct show_var_st status_vars[]= { {"Key_reads", (char*) &dflt_key_cache_var.global_cache_read, SHOW_KEY_CACHE_LONG}, {"Key_write_requests", (char*) &dflt_key_cache_var.global_cache_w_requests, SHOW_KEY_CACHE_LONG}, {"Key_writes", (char*) &dflt_key_cache_var.global_cache_write, SHOW_KEY_CACHE_LONG}, - {"Last_query_cost", (char*) &last_query_cost, SHOW_DOUBLE}, + {"Last_query_cost", (char*) offsetof(STATUS_VAR, last_query_cost), SHOW_DOUBLE_STATUS}, {"Max_used_connections", (char*) &max_used_connections, SHOW_LONG}, #ifdef HAVE_NDBCLUSTER_DB {"Ndb_", (char*) &ndb_status_variables, SHOW_VARS}, |