Commit 41c8f461 authored by sergefp@mysql.com's avatar sergefp@mysql.com

Post-review fixes: rename SHOW_DOUBLE to SHOW_DOUBLE_STATUS

parent b6179919
...@@ -5713,7 +5713,7 @@ struct show_var_st status_vars[]= { ...@@ -5713,7 +5713,7 @@ struct show_var_st status_vars[]= {
{"Key_reads", (char*) &dflt_key_cache_var.global_cache_read, SHOW_KEY_CACHE_LONG}, {"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_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}, {"Key_writes", (char*) &dflt_key_cache_var.global_cache_write, SHOW_KEY_CACHE_LONG},
{"Last_query_cost", (char*) offsetof(STATUS_VAR, 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}, {"Max_used_connections", (char*) &max_used_connections, SHOW_LONG},
#ifdef HAVE_NDBCLUSTER_DB #ifdef HAVE_NDBCLUSTER_DB
{"Ndb_", (char*) &ndb_status_variables, SHOW_VARS}, {"Ndb_", (char*) &ndb_status_variables, SHOW_VARS},
......
...@@ -1356,7 +1356,7 @@ static bool show_status_array(THD *thd, const char *wild, ...@@ -1356,7 +1356,7 @@ static bool show_status_array(THD *thd, const char *wild,
end= strend(pos); end= strend(pos);
break; break;
} }
case SHOW_DOUBLE: case SHOW_DOUBLE_STATUS:
{ {
value= ((char *) status_var + (ulong) value); value= ((char *) status_var + (ulong) value);
end= buff + sprintf(buff, "%f", *(double*) value); end= buff + sprintf(buff, "%f", *(double*) value);
......
...@@ -164,7 +164,8 @@ typedef struct st_known_date_time_format { ...@@ -164,7 +164,8 @@ typedef struct st_known_date_time_format {
enum SHOW_TYPE enum SHOW_TYPE
{ {
SHOW_UNDEF, SHOW_UNDEF,
SHOW_LONG, SHOW_LONGLONG, SHOW_INT, SHOW_CHAR, SHOW_CHAR_PTR, SHOW_DOUBLE, SHOW_LONG, SHOW_LONGLONG, SHOW_INT, SHOW_CHAR, SHOW_CHAR_PTR,
SHOW_DOUBLE_STATUS,
SHOW_BOOL, SHOW_MY_BOOL, SHOW_OPENTABLES, SHOW_STARTTIME, SHOW_QUESTION, SHOW_BOOL, SHOW_MY_BOOL, SHOW_OPENTABLES, SHOW_STARTTIME, SHOW_QUESTION,
SHOW_LONG_CONST, SHOW_INT_CONST, SHOW_HAVE, SHOW_SYS, SHOW_HA_ROWS, SHOW_LONG_CONST, SHOW_INT_CONST, SHOW_HAVE, SHOW_SYS, SHOW_HA_ROWS,
SHOW_VARS, SHOW_VARS,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment