diff options
| author | unknown <bell@sanja.is.com.ua> | 2004-05-04 15:35:11 +0300 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2004-05-04 15:35:11 +0300 |
| commit | 23029a0f56906cc01270dee5bd6937b74944deb1 (patch) | |
| tree | 2ec79d2ff28a10ac877a2a5bb2b330a594ec4777 /sql | |
| parent | 748db21631c0850c2dccd61aa791358e0fa96470 (diff) | |
| parent | f171556b54096e7a45ca1c9808b57b7f9d3c8166 (diff) | |
| download | mariadb-git-23029a0f56906cc01270dee5bd6937b74944deb1.tar.gz | |
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-sub-4.1
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/ha_innodb.cc | 1 | ||||
| -rw-r--r-- | sql/mysqld.cc | 6 | ||||
| -rw-r--r-- | sql/sql_show.cc | 1 | ||||
| -rw-r--r-- | sql/sql_test.cc | 2 | ||||
| -rw-r--r-- | sql/structs.h | 3 |
5 files changed, 8 insertions, 5 deletions
diff --git a/sql/ha_innodb.cc b/sql/ha_innodb.cc index 4192df22e5c..872a6abef8b 100644 --- a/sql/ha_innodb.cc +++ b/sql/ha_innodb.cc @@ -4780,7 +4780,6 @@ innodb_show_status( /*===============*/ THD* thd) /* in: the MySQL query thread of the caller */ { - char* buf; Protocol *protocol= thd->protocol; trx_t* trx; diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 80d96a62f1b..b85041207bd 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -4844,8 +4844,10 @@ struct show_var_st status_vars[]= { {"Handler_discover", (char*) &ha_discover_count, SHOW_LONG}, {"Key_blocks_not_flushed", (char*) &dflt_key_cache_var.global_blocks_changed, SHOW_KEY_CACHE_LONG}, - {"Key_blocks_used", (char*) &dflt_key_cache_var.global_blocks_used, - SHOW_KEY_CACHE_LONG}, + {"Key_blocks_used", (char*) &dflt_key_cache_var.blocks_used, + SHOW_KEY_CACHE_CONST_LONG}, + {"Key_blocks_unused", (char*) &dflt_key_cache_var.blocks_unused, + SHOW_KEY_CACHE_CONST_LONG}, {"Key_read_requests", (char*) &dflt_key_cache_var.global_cache_r_requests, SHOW_KEY_CACHE_LONG}, {"Key_reads", (char*) &dflt_key_cache_var.global_cache_read, diff --git a/sql/sql_show.cc b/sql/sql_show.cc index 448dc825a26..51b44af63ec 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -2021,6 +2021,7 @@ int mysqld_show(THD *thd, const char *wild, show_var_st *variables, #endif /* HAVE_OPENSSL */ case SHOW_KEY_CACHE_LONG: + case SHOW_KEY_CACHE_CONST_LONG: value= (value-(char*) &dflt_key_cache_var)+ (char*) sql_key_cache; end= int10_to_str(*(long*) value, buff, 10); break; diff --git a/sql/sql_test.cc b/sql/sql_test.cc index cc3d30e5983..d992c93f8fc 100644 --- a/sql/sql_test.cc +++ b/sql/sql_test.cc @@ -329,7 +329,7 @@ reads: %10lu\n\n", name, (ulong) key_cache->param_buff_size, key_cache->param_block_size, key_cache->param_division_limit, key_cache->param_age_threshold, - key_cache->global_blocks_used,key_cache->global_blocks_changed, + key_cache->blocks_used,key_cache->global_blocks_changed, key_cache->global_cache_w_requests,key_cache->global_cache_write, key_cache->global_cache_r_requests,key_cache->global_cache_read); } diff --git a/sql/structs.h b/sql/structs.h index 86d754f00d6..d9607b220f7 100644 --- a/sql/structs.h +++ b/sql/structs.h @@ -183,7 +183,8 @@ enum SHOW_TYPE SHOW_SSL_CTX_SESS_TIMEOUTS, SHOW_SSL_CTX_SESS_CACHE_FULL, SHOW_SSL_GET_CIPHER_LIST, #endif /* HAVE_OPENSSL */ - SHOW_RPL_STATUS, SHOW_SLAVE_RUNNING, SHOW_KEY_CACHE_LONG + SHOW_RPL_STATUS, SHOW_SLAVE_RUNNING, + SHOW_KEY_CACHE_LONG, SHOW_KEY_CACHE_CONST_LONG }; enum SHOW_COMP_OPTION { SHOW_OPTION_YES, SHOW_OPTION_NO, SHOW_OPTION_DISABLED}; |