bk commit into 5.0 tree (gluh:1.2471) BUG#28149

[gluh]

Below is the list of changes that have just been committed into a local
5.0 repository of gluh. When gluh 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-06-04 17:47:33+05:00, gluh@stripped +4 -0
  Bug#28149 overflow in some "SHOW STATUS"-variables
  changed bytes_received, bytes_sent status variables to ulonglong

  sql/mysqld.cc@stripped, 2007-06-04 17:47:31+05:00, gluh@stripped +2 -2
    changed bytes_received, bytes_sent status variables to longlong

  sql/sql_class.h@stripped, 2007-06-04 17:47:31+05:00, gluh@stripped +2 -2
    changed bytes_received, bytes_sent status variables to longlong

  sql/sql_show.cc@stripped, 2007-06-04 17:47:31+05:00, gluh@stripped +2 -0
    changed bytes_received, bytes_sent status variables to longlong

  sql/structs.h@stripped, 2007-06-04 17:47:31+05:00, gluh@stripped +2 -1
    changed bytes_received, bytes_sent status variables to longlong

# 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:	gluh
# Host:	eagle.(none)
# Root:	/home/gluh/MySQL/Bugs/5.0.28149

--- 1.607/sql/mysqld.cc	2007-04-23 23:38:38 +05:00
+++ 1.608/sql/mysqld.cc	2007-06-04 17:47:31 +05:00
@@ -6177,8 +6177,8 @@ struct show_var_st status_vars[]= {
   {"Aborted_connects",         (char*) &aborted_connects,       SHOW_LONG},
   {"Binlog_cache_disk_use",    (char*) &binlog_cache_disk_use,  SHOW_LONG},
   {"Binlog_cache_use",         (char*) &binlog_cache_use,       SHOW_LONG},
-  {"Bytes_received",           (char*) offsetof(STATUS_VAR, bytes_received),
SHOW_LONG_STATUS},
-  {"Bytes_sent",               (char*) offsetof(STATUS_VAR, bytes_sent),
SHOW_LONG_STATUS},
+  {"Bytes_received",           (char*) offsetof(STATUS_VAR, bytes_received),
SHOW_LONGLONG_STATUS},
+  {"Bytes_sent",               (char*) offsetof(STATUS_VAR, bytes_sent),
SHOW_LONGLONG_STATUS},
   {"Com_admin_commands",       (char*) offsetof(STATUS_VAR, com_other),
SHOW_LONG_STATUS},
   {"Com_alter_db",	       (char*) offsetof(STATUS_VAR, com_stat[(uint) SQLCOM_ALTER_DB]),
SHOW_LONG_STATUS},
   {"Com_alter_table",	       (char*) offsetof(STATUS_VAR, com_stat[(uint)
SQLCOM_ALTER_TABLE]), SHOW_LONG_STATUS},

--- 1.328/sql/sql_class.h	2007-04-03 16:55:14 +05:00
+++ 1.329/sql/sql_class.h	2007-06-04 17:47:31 +05:00
@@ -605,8 +605,8 @@ struct system_variables
 
 typedef struct system_status_var
 {
-  ulong bytes_received;
-  ulong bytes_sent;
+  ulonglong bytes_received;
+  ulonglong bytes_sent;
   ulong com_other;
   ulong com_stat[(uint) SQLCOM_END];
   ulong created_tmp_disk_tables;

--- 1.347/sql/sql_show.cc	2007-04-21 03:36:15 +05:00
+++ 1.348/sql/sql_show.cc	2007-06-04 17:47:31 +05:00
@@ -1463,6 +1463,8 @@ static bool show_status_array(THD *thd, 
         case SHOW_LONG_CONST:
           end= int10_to_str(*(long*) value, buff, 10);
           break;
+        case SHOW_LONGLONG_STATUS:
+          value= ((char *) status_var + (ulonglong) value);
         case SHOW_LONGLONG:
           end= longlong10_to_str(*(longlong*) value, buff, 10);
           break;

--- 1.57/sql/structs.h	2006-12-31 00:02:07 +04:00
+++ 1.58/sql/structs.h	2007-06-04 17:47:31 +05:00
@@ -191,7 +191,8 @@ enum SHOW_TYPE
   SHOW_NET_COMPRESSION,
   SHOW_RPL_STATUS, SHOW_SLAVE_RUNNING, SHOW_SLAVE_RETRIED_TRANS,
   SHOW_KEY_CACHE_LONG, SHOW_KEY_CACHE_CONST_LONG, SHOW_KEY_CACHE_LONGLONG,
-  SHOW_LONG_STATUS, SHOW_LONG_CONST_STATUS, SHOW_SLAVE_SKIP_ERRORS
+  SHOW_LONG_STATUS, SHOW_LONG_CONST_STATUS, SHOW_SLAVE_SKIP_ERRORS,
+  SHOW_LONGLONG_STATUS
 };
 
 enum SHOW_COMP_OPTION { SHOW_OPTION_YES, SHOW_OPTION_NO, SHOW_OPTION_DISABLED};