Commit 48e0630d authored by unknown's avatar unknown
Browse files

Post-review fixes: rename SHOW_DOUBLE to SHOW_DOUBLE_STATUS

parent 83062698

sql/mysqld.cc

+1 −1
Original line number Diff line number Diff line
@@ -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_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*) 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},

#ifdef HAVE_NDBCLUSTER_DB

  {"Ndb_",                     (char*) &ndb_status_variables,   SHOW_VARS},

sql/sql_show.cc

+1 −1
Original line number Diff line number Diff line
@@ -1356,7 +1356,7 @@ static bool show_status_array(THD *thd, const char *wild, 
          end= strend(pos);

          break;

        }

        case SHOW_DOUBLE:

        case SHOW_DOUBLE_STATUS:

        {

          value= ((char *) status_var + (ulong) value);

          end= buff + sprintf(buff, "%f", *(double*) value);

sql/structs.h

+2 −1
Original line number Diff line number Diff line
@@ -164,7 +164,8 @@ typedef struct st_known_date_time_format { 
enum SHOW_TYPE

{

  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_LONG_CONST, SHOW_INT_CONST, SHOW_HAVE, SHOW_SYS, SHOW_HA_ROWS,

  SHOW_VARS,