Below is the list of changes that have just been committed into a local
5.0 repository of mydev. When mydev does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
ChangeSet
1.1956 05/09/14 13:37:16 ingo@stripped +6 -0
Merge mysql.com:/home/mydev/mysql-4.1-4100
into mysql.com:/home/mydev/mysql-5.0-5000
sql/structs.h
1.49 05/09/14 13:37:11 ingo@stripped +1 -2
Manual merge.
sql/sql_show.cc
1.280 05/09/14 13:37:11 ingo@stripped +4 -4
Manual merge.
sql/mysqld.cc
1.496 05/09/14 13:37:11 ingo@stripped +4 -8
Manual merge.
sql/sql_test.cc
1.43 05/09/14 13:30:10 ingo@stripped +0 -0
Auto merged
mysys/mf_keycache.c
1.53 05/09/14 13:30:09 ingo@stripped +0 -0
Auto merged
include/my_sys.h
1.168 05/09/14 13:30:09 ingo@stripped +0 -0
Auto merged
# This is a BitKeeper patch. What follows are the unified diffs for the
# set of deltas contained in the patch. The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User: ingo
# Host: chilla.local
# Root: /home/mydev/mysql-5.0-5000/RESYNC
--- 1.167/include/my_sys.h 2005-08-30 20:19:05 +02:00
+++ 1.168/include/my_sys.h 2005-09-14 13:30:09 +02:00
@@ -237,9 +237,6 @@
extern CHARSET_INFO compiled_charsets[];
/* statistics */
-extern ulong my_cache_w_requests, my_cache_write, my_cache_r_requests,
- my_cache_read;
-extern ulong my_blocks_used, my_blocks_changed;
extern ulong my_file_opened,my_stream_opened, my_tmp_file_created;
extern uint mysys_usage_id;
extern my_bool my_init_done;
--- 1.52/mysys/mf_keycache.c 2005-06-13 12:41:06 +02:00
+++ 1.53/mysys/mf_keycache.c 2005-09-14 13:30:09 +02:00
@@ -632,12 +632,13 @@
keycache->blocks_changed= 0;
}
- DBUG_PRINT("status",
- ("used: %d changed: %d w_requests: %ld \
-writes: %ld r_requests: %ld reads: %ld",
- keycache->blocks_used, keycache->global_blocks_changed,
- keycache->global_cache_w_requests, keycache->global_cache_write,
- keycache->global_cache_r_requests, keycache->global_cache_read));
+ DBUG_PRINT("status", ("used: %d changed: %d w_requests: %lu "
+ "writes: %lu r_requests: %lu reads: %lu",
+ keycache->blocks_used, keycache->global_blocks_changed,
+ (ulong) keycache->global_cache_w_requests,
+ (ulong) keycache->global_cache_write,
+ (ulong) keycache->global_cache_r_requests,
+ (ulong) keycache->global_cache_read));
if (cleanup)
{
--- 1.495/sql/mysqld.cc 2005-09-06 20:20:14 +02:00
+++ 1.496/sql/mysqld.cc 2005-09-14 13:37:11 +02:00
@@ -5880,10 +5880,10 @@
{"Key_blocks_not_flushed", (char*) &dflt_key_cache_var.global_blocks_changed, SHOW_KEY_CACHE_LONG},
{"Key_blocks_unused", (char*) &dflt_key_cache_var.blocks_unused, SHOW_KEY_CACHE_CONST_LONG},
{"Key_blocks_used", (char*) &dflt_key_cache_var.blocks_used, 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, 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_read_requests", (char*) &dflt_key_cache_var.global_cache_r_requests, SHOW_KEY_CACHE_LONGLONG},
+ {"Key_reads", (char*) &dflt_key_cache_var.global_cache_read, SHOW_KEY_CACHE_LONGLONG},
+ {"Key_write_requests", (char*) &dflt_key_cache_var.global_cache_w_requests, SHOW_KEY_CACHE_LONGLONG},
+ {"Key_writes", (char*) &dflt_key_cache_var.global_cache_write, SHOW_KEY_CACHE_LONGLONG},
{"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
--- 1.279/sql/sql_show.cc 2005-09-14 09:45:56 +02:00
+++ 1.280/sql/sql_show.cc 2005-09-14 13:37:11 +02:00
@@ -1614,6 +1614,10 @@
value= (value-(char*) &dflt_key_cache_var)+ (char*) dflt_key_cache;
end= int10_to_str(*(long*) value, buff, 10);
break;
+ case SHOW_KEY_CACHE_LONGLONG:
+ value= (value-(char*) &dflt_key_cache_var)+ (char*) dflt_key_cache;
+ end= longlong10_to_str(*(longlong*) value, buff, 10);
+ break;
case SHOW_UNDEF: // Show never happen
case SHOW_SYS:
break; // Return empty string
--- 1.42/sql/sql_test.cc 2005-08-15 21:37:05 +02:00
+++ 1.43/sql/sql_test.cc 2005-09-14 13:30:10 +02:00
@@ -408,6 +408,11 @@
static int print_key_cache_status(const char *name, KEY_CACHE *key_cache)
{
+ char llbuff1[22];
+ char llbuff2[22];
+ char llbuff3[22];
+ char llbuff4[22];
+
if (!key_cache->key_cache_inited)
{
printf("%s: Not in use\n", name);
@@ -421,16 +426,18 @@
Age_limit: %10lu\n\
blocks used: %10lu\n\
not flushed: %10lu\n\
-w_requests: %10lu\n\
-writes: %10lu\n\
-r_requests: %10lu\n\
-reads: %10lu\n\n",
+w_requests: %10s\n\
+writes: %10s\n\
+r_requests: %10s\n\
+reads: %10s\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->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);
+ llstr(key_cache->global_cache_w_requests,llbuff1),
+ llstr(key_cache->global_cache_write,llbuff2),
+ llstr(key_cache->global_cache_r_requests,llbuff3),
+ llstr(key_cache->global_cache_read,llbuff4));
}
return 0;
}
--- 1.48/sql/structs.h 2005-06-16 09:11:48 +02:00
+++ 1.49/sql/structs.h 2005-09-14 13:37:11 +02:00
@@ -186,7 +186,7 @@
SHOW_SSL_GET_CIPHER_LIST,
#endif /* HAVE_OPENSSL */
SHOW_RPL_STATUS, SHOW_SLAVE_RUNNING, SHOW_SLAVE_RETRIED_TRANS,
- SHOW_KEY_CACHE_LONG, SHOW_KEY_CACHE_CONST_LONG,
+ SHOW_KEY_CACHE_LONG, SHOW_KEY_CACHE_CONST_LONG, SHOW_KEY_CACHE_LONGLONG,
SHOW_LONG_STATUS, SHOW_LONG_CONST_STATUS, SHOW_SLAVE_SKIP_ERRORS
};
| Thread |
|---|
| • bk commit into 5.0 tree (ingo:1.1956) | ingo | 14 Sep |
