bk commit into 4.0 tree (1.1481)

Below is the list of changes that have just been committed into a local
4.0 repository of monty. When monty 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.1481 03/04/28 19:05:57 monty@xxxxxxxxxxxxxxx +6 -0
  Fix to remove compiler warnings

  vio/viossl.c
    1.19 03/04/28 19:05:55 monty@xxxxxxxxxxxxxxx +9 -3
    Fix to remove compiler warning

  myisammrg/myrg_extra.c
    1.12 03/04/28 19:05:55 monty@xxxxxxxxxxxxxxx +1 -1
    Fix to remove compiler warning

  myisam/sort.c
    1.28 03/04/28 19:05:55 monty@xxxxxxxxxxxxxxx +2 -0
    Fix to remove compiler warning

  libmysqld/libmysqld.c
    1.18 03/04/28 19:05:55 monty@xxxxxxxxxxxxxxx +3 -3
    Fix to remove compiler warning

  include/violite.h
    1.29 03/04/28 19:05:55 monty@xxxxxxxxxxxxxxx +2 -2
    Fix to remove compiler warning

  include/my_global.h
    1.42 03/04/28 19:05:55 monty@xxxxxxxxxxxxxxx +1 -1
    Fixed wrong #ifdef

# 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: monty
# Host: mashka.mysql.fi
# Root: /home/my/mysql-4.0

--- 1.28/include/violite.h      Thu Feb 27 21:29:55 2003
+++ 1.29/include/violite.h      Mon Apr 28 19:05:55 2003
@@ -148,7 +148,7 @@
 int vio_ssl_close(Vio* vio);
 /* Return last error number */
 int vio_ssl_errno(Vio *vio);
-my_bool vio_ssl_peer_addr(Vio* vio, char *buf);
+my_bool vio_ssl_peer_addr(Vio* vio, char *buf, uint16 *port);
 void vio_ssl_in_addr(Vio *vio, struct in_addr *in);
 int vio_ssl_blocking(Vio * vio, my_bool set_blocking_mode, my_bool *old_mode);
 
@@ -224,7 +224,7 @@
   my_bool (*is_blocking)(Vio*);
   int     (*viokeepalive)(Vio*, my_bool);
   int     (*fastsend)(Vio*);
-  my_bool (*peer_addr)(Vio*, gptr, uint16*);
+  my_bool (*peer_addr)(Vio*, char *, uint16*);
   void    (*in_addr)(Vio*, struct in_addr*);
   my_bool (*should_retry)(Vio*);
   int     (*vioclose)(Vio*);

--- 1.27/myisam/sort.c  Sun Apr 27 22:12:05 2003
+++ 1.28/myisam/sort.c  Mon Apr 28 19:05:55 2003
@@ -286,6 +286,8 @@
   uint idx, maxbuffer;
   uchar **sort_keys=0;
 
+  LINT_INIT(keys);
+
   error=1;
 
   if (my_thread_init())

--- 1.11/myisammrg/myrg_extra.c Fri Nov 29 16:40:15 2002
+++ 1.12/myisammrg/myrg_extra.c Mon Apr 28 19:05:55 2003
@@ -33,7 +33,7 @@
   if (function == HA_EXTRA_CACHE)
   {
     info->cache_in_use=1;
-    info->cache_size= (extra_arg ? *(long*) extra_arg :
+    info->cache_size= (extra_arg ? *(ulong*) extra_arg :
                       my_default_record_cache_size);
   }
   else

--- 1.41/include/my_global.h    Mon Apr 28 10:32:53 2003
+++ 1.42/include/my_global.h    Mon Apr 28 19:05:55 2003
@@ -268,7 +268,7 @@
 #endif
 #include <errno.h>                             /* Recommended by debian */
 /* We need the following to go around a problem with openssl on solaris */
-#if defined(HAVE_CRYPT)
+#if defined(HAVE_CRYPT_H)
 #include <crypt.h>
 #endif
 

--- 1.17/libmysqld/libmysqld.c  Mon Feb 17 02:14:34 2003
+++ 1.18/libmysqld/libmysqld.c  Mon Apr 28 19:05:55 2003
@@ -62,7 +62,7 @@
 #define closesocket(A) close(A)
 #endif
 
-static void mysql_once_init(void);
+static void mysqld_once_init(void);
 static MYSQL_DATA *read_rows (MYSQL *mysql,MYSQL_FIELD *fields,
                              uint field_count);
 static int read_one_row(MYSQL *mysql,uint fields,MYSQL_ROW row,
@@ -729,7 +729,7 @@
 MYSQL * STDCALL
 mysql_init(MYSQL *mysql)
 {
-  mysql_once_init();
+  mysqld_once_init();
   if (!mysql)
   {
     if (!(mysql=(MYSQL*) my_malloc(sizeof(*mysql),MYF(MY_WME | MY_ZEROFILL))))
@@ -743,7 +743,7 @@
 }
 
 
-static void mysql_once_init()
+static void mysqld_once_init()
 {
   if (!mysql_client_init)
   {

--- 1.18/vio/viossl.c   Wed Apr 16 15:25:03 2003
+++ 1.19/vio/viossl.c   Mon Apr 28 19:05:55 2003
@@ -212,13 +212,14 @@
 }
 
 
-my_bool vio_ssl_peer_addr(Vio * vio, char *buf)
+my_bool vio_ssl_peer_addr(Vio * vio, char *buf, uint16 *port)
 {
   DBUG_ENTER("vio_ssl_peer_addr");
   DBUG_PRINT("enter", ("sd=%d", vio->sd));
   if (vio->localhost)
   {
     strmov(buf,"127.0.0.1");
+    *port=0;
   }
   else
   {
@@ -229,8 +230,13 @@
       DBUG_PRINT("exit", ("getpeername, error: %d", socket_errno));
       DBUG_RETURN(1);
     }
-    /* FIXME */
-/*    my_inet_ntoa(vio->remote.sin_addr,buf); */
+#ifdef TO_BE_FIXED
+    my_inet_ntoa(vio->remote.sin_addr,buf);
+    *port= 0;
+#else
+    strmov(buf, "unknown");
+    *port= 0;
+#endif
   }
   DBUG_PRINT("exit", ("addr=%s", buf));
   DBUG_RETURN(0);

-- 
MySQL Internals Mailing List
For list archives: http://lists.mysql.com/internals
To unsubscribe:    
http://lists.mysql.com/internals?unsub=gcdmd-internals@xxxxxxxxxxx