bk commit into 5.0 tree (cmiller:1.2382)

[Chad MILLER]

Below is the list of changes that have just been committed into a local
5.0 repository of cmiller. When cmiller 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@stripped, 2007-01-18 09:53:07-05:00, cmiller@stripped +2 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-5.0-community
  into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-community
  MERGE: 1.2356.2.4

  sql/mysql_priv.h@stripped, 2007-01-18 09:53:04-05:00, cmiller@stripped +0 -0
    Auto merged
    MERGE: 1.427.1.1

  sql/mysqld.cc@stripped, 2007-01-18 09:53:04-05:00, cmiller@stripped +0 -0
    Auto merged
    MERGE: 1.584.2.1

# 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:	cmiller
# Host:	zippy.cornsilk.net
# Root:	/home/cmiller/work/mysql/mysql-5.0-community/RESYNC

--- 1.428/sql/mysql_priv.h	2007-01-18 09:53:11 -05:00
+++ 1.429/sql/mysql_priv.h	2007-01-18 09:53:11 -05:00
@@ -1191,7 +1191,7 @@ void my_dbopt_free(void);
   External variables
 */
 
-extern time_t start_time;
+extern time_t start_time, flush_status_time;
 extern char *mysql_data_home,server_version[SERVER_VERSION_LENGTH],
 	    mysql_real_data_home[], *opt_mysql_tmpdir, mysql_charsets_dir[],
             def_ft_boolean_syntax[sizeof(ft_boolean_syntax)];

--- 1.587/sql/mysqld.cc	2007-01-18 09:53:11 -05:00
+++ 1.588/sql/mysqld.cc	2007-01-18 09:53:11 -05:00
@@ -432,7 +432,7 @@ ulong expire_logs_days = 0;
 ulong rpl_recovery_rank=0;
 
 double log_10[32];			/* 10 potences */
-time_t start_time;
+time_t start_time, flush_status_time;
 
 char mysql_home[FN_REFLEN], pidfile_name[FN_REFLEN], system_time_zone[30];
 char *default_tz_name;
@@ -2593,7 +2593,7 @@ static int init_common_variables(const c
   tzset();			// Set tzname
 
   max_system_variables.pseudo_thread_id= (ulong)~0;
-  start_time=time((time_t*) 0);
+  start_time= flush_status_time= time((time_t*) 0);
   if (init_thread_environment())
     return 1;
   mysql_init_variables();
@@ -6274,6 +6274,7 @@ struct show_var_st status_vars[]= {
   {"Threads_created",	       (char*) &thread_created,		SHOW_LONG_CONST},
   {"Threads_running",          (char*) &thread_running,         SHOW_INT_CONST},
   {"Uptime",                   (char*) 0,                       SHOW_STARTTIME},
+  {"Uptime_since_flush_status",(char*) 0,                       SHOW_FLUSHTIME},
   {NullS, NullS, SHOW_LONG}
 };
 
@@ -7544,6 +7545,7 @@ void refresh_status(THD *thd)
 
   /* Reset the counters of all key caches (default and named). */
   process_key_caches(reset_key_cache_counters);
+  flush_status_time= time((time_t*) 0);
   pthread_mutex_unlock(&LOCK_status);
 
   /*