diff options
| author | unknown <sergefp@mysql.com> | 2005-05-26 20:54:02 +0200 |
|---|---|---|
| committer | unknown <sergefp@mysql.com> | 2005-05-26 20:54:02 +0200 |
| commit | 48e0630d2f71b47a12ef85124bba570d73ff7b65 (patch) | |
| tree | 0ba6dc09073f7ba9d441e1d76a9f952454d13d67 /sql | |
| parent | 83062698fd25eeea9291b6317502b1564d96eeb8 (diff) | |
| download | mariadb-git-48e0630d2f71b47a12ef85124bba570d73ff7b65.tar.gz | |
Post-review fixes: rename SHOW_DOUBLE to SHOW_DOUBLE_STATUS
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/mysqld.cc | 2 | ||||
| -rw-r--r-- | sql/sql_show.cc | 2 | ||||
| -rw-r--r-- | sql/structs.h | 3 |
3 files changed, 4 insertions, 3 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index e45a61b0c04..b6e80402114 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -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}, diff --git a/sql/sql_show.cc b/sql/sql_show.cc index a5d12dffc4b..3d23e22c590 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -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); diff --git a/sql/structs.h b/sql/structs.h index 7a70bfc0f4f..306089016bc 100644 --- a/sql/structs.h +++ b/sql/structs.h @@ -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, |