bk commit into 4.0 tree (1.1624)

Below is the list of changes that have just been committed into a local
4.0 repository of bell. When bell 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://www.mysql.com/doc/I/n/Installing_source_tree.html

ChangeSet
  1.1624 03/02/27 20:31:54 bell@xxxxxxxxxxxxxxx +3 -0
  posreview changing (SCRUM)
  
  increased compatibility
  postmerge changing

  vio/viosocket.c
    1.17 03/02/27 20:31:52 bell@xxxxxxxxxxxxxxx +1 -1
    increased compatibility

  sql/sql_show.cc
    1.101 03/02/27 20:31:52 bell@xxxxxxxxxxxxxxx +2 -5
    postmerge changing

  sql/sql_class.h
    1.140 03/02/27 20:31:52 bell@xxxxxxxxxxxxxxx +1 -1
    increased compatibility

# 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: bell
# Host: sanja.is.com.ua
# Root: /home/bell/mysql/work-show-4.0

--- 1.139/sql/sql_class.h       Mon Feb 17 22:07:16 2003
+++ 1.140/sql/sql_class.h       Thu Feb 27 20:31:52 2003
@@ -352,7 +352,7 @@
    */
   char   *host,*user,*priv_user,*db,*ip;
   /* remote (peer) port */
-  u_int16_t peer_port;
+  uint16 peer_port;
   /* Points to info-string that will show in SHOW PROCESSLIST */
   const char *proc_info;
   /* points to host if host is available, otherwise points to ip */

--- 1.100/sql/sql_show.cc       Thu Feb 27 19:38:38 2003
+++ 1.101/sql/sql_show.cc       Thu Feb 27 20:31:52 2003
@@ -1064,13 +1064,10 @@
        {
          if ((thd_info->host= thd->alloc(LIST_PROCESS_HOST_LEN+1)))
            snprintf((char *) thd_info->host, LIST_PROCESS_HOST_LEN, "%s:%u",
-                    (tmp->host ? tmp->host : tmp->ip), tmp->peer_port);
+                    thd->host_or_ip, tmp->peer_port);
        }
        else
-         thd_info->host= thd->strdup(tmp->host ? tmp->host :
-                                     (tmp->ip ? tmp->ip :
-                                      (tmp->system_thread ? "none" :
-                                       "connecting host")));
+         thd_info->host= thd->strdup(thd->host_or_ip);
         if ((thd_info->db=tmp->db))             // Safe test
           thd_info->db=thd->strdup(thd_info->db);
         thd_info->command=(int) tmp->command;

--- 1.16/vio/viosocket.c        Mon Feb 17 22:07:16 2003
+++ 1.17/vio/viosocket.c        Thu Feb 27 20:31:52 2003
@@ -277,7 +277,7 @@
 }
 
 
-my_bool vio_peer_addr(Vio * vio, char *buf, u_int16_t *port)
+my_bool vio_peer_addr(Vio * vio, char *buf, uint16 *port)
 {
   DBUG_ENTER("vio_peer_addr");
   DBUG_PRINT("enter", ("sd: %d", vio->sd));

---------------------------------------------------------------------
Before posting, please check:
   http://www.mysql.com/manual.php   (the manual)
   http://lists.mysql.com/           (the list archive)

To request this thread, e-mail internals-thread7216@xxxxxxxxxxxxxxx
To unsubscribe, e-mail <internals-unsubscribe@xxxxxxxxxxxxxxx>