Commit 67347ba3 authored by unknown's avatar unknown
Browse files

Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1


configure.in:
  Auto merged
include/my_global.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
storage/myisam/mi_test2.c:
  Auto merged
parents f4f26dd3 fbe338f4

include/keycache.h

+4 −4
Original line number Diff line number Diff line
@@ -90,10 +90,10 @@ typedef struct st_key_cache 


  /* Statistics variables. These are reset in reset_key_cache_counters(). */

  ulong global_blocks_changed;	/* number of currently dirty blocks         */

  ulong global_cache_w_requests;/* number of write requests (write hits)    */

  ulong global_cache_write;     /* number of writes from the cache to files */

  ulong global_cache_r_requests;/* number of read requests (read hits)      */

  ulong global_cache_read;      /* number of reads from files to the cache  */

  ulonglong global_cache_w_requests;/* number of write requests (write hits) */

  ulonglong global_cache_write;     /* number of writes from cache to files  */

  ulonglong global_cache_r_requests;/* number of read requests (read hits)   */

  ulonglong global_cache_read;      /* number of reads from files to cache   */



  int blocks;                   /* max number of blocks in the cache        */

  my_bool in_init;		/* Set to 1 in MySQL during init/resize     */

include/my_sys.h

+0 −3
Original line number Diff line number Diff line
@@ -237,9 +237,6 @@ extern CHARSET_INFO *all_charsets[256]; 
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;

mysys/mf_keycache.c

+7 −6
Original line number Diff line number Diff line
@@ -632,12 +632,13 @@ void end_key_cache(KEY_CACHE *keycache, my_bool cleanup) 
    keycache->blocks_changed= 0;

  }



  DBUG_PRINT("status",

    ("used: %d  changed: %d  w_requests: %ld  \

writes: %ld  r_requests: %ld  reads: %ld",

  DBUG_PRINT("status", ("used: %d  changed: %d  w_requests: %lu  "

                        "writes: %lu  r_requests: %lu  reads: %lu",

                        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));

                        (ulong) keycache->global_cache_w_requests,

                        (ulong) keycache->global_cache_write,

                        (ulong) keycache->global_cache_r_requests,

                        (ulong) keycache->global_cache_read));



  if (cleanup)

  {

sql/mysqld.cc

+4 −4
Original line number Diff line number Diff line
@@ -5922,10 +5922,10 @@ struct show_var_st status_vars[]= { 
  {"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

sql/sql_show.cc

+4 −0
Original line number Diff line number Diff line
@@ -1650,6 +1650,10 @@ static bool show_status_array(THD *thd, const char *wild, 
          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