bk commit into 4.1 tree (kroki:1.2556)

[kroki]

Below is the list of changes that have just been committed into a local
4.1 repository of tomash. When tomash 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, 2006-10-13 14:26:28+04:00, kroki@stripped +4 -0
  Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.0
  into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.1-bug9678
  MERGE: 1.1346.1.848

  BitKeeper/deleted/.del-lib_vio.c~d779731a1e391220@stripped, 2006-10-13 14:25:50+04:00, kroki@stripped +0 -1
    Use local.
    MERGE: 1.11.3.2

  BitKeeper/deleted/.del-lib_vio.c~d779731a1e391220@stripped, 2006-10-13 14:24:57+04:00, kroki@stripped +0 -0
    Merge rename: libmysqld/lib_vio.c -> BitKeeper/deleted/.del-lib_vio.c~d779731a1e391220

  include/violite.h@stripped, 2006-10-13 14:26:08+04:00, kroki@stripped +0 -3
    Use local.
    MERGE: 1.21.3.8

  sql/net_serv.cc@stripped, 2006-10-13 14:26:14+04:00, kroki@stripped +0 -2
    Use local.
    MERGE: 1.46.1.19

  vio/viosocket.c@stripped, 2006-10-13 14:26:21+04:00, kroki@stripped +0 -20
    Use local.
    MERGE: 1.15.1.8

# 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:	kroki
# Host:	moonlight.intranet
# Root:	/home/tomash/src/mysql_ab/mysql-4.1-bug9678/RESYNC

--- 1.11.3.1/libmysqld/lib_vio.c	2006-10-13 14:26:32 +04:00
+++ 1.22/BitKeeper/deleted/.del-lib_vio.c~d779731a1e391220	2006-10-13 14:26:32 +04:00
@@ -20,6 +20,7 @@
   we are working on.  In this case we should just return read errors from
   the file descriptior.
 */
+#ifdef DUMMY
 
 #include <my_global.h>
 #include "mysql_embed.h"
@@ -30,7 +31,6 @@
 #include <errno.h>
 #include <my_sys.h>
 #include <violite.h>
-#include <my_sys.h>
 #include <my_net.h>
 #include <m_string.h>
 #include <assert.h>
@@ -41,14 +41,7 @@
 
 struct st_vio
 {
-  my_socket		sd;		/* my_socket - real or imaginary */
-  HANDLE hPipe;
-  my_bool		localhost;	/* Are we from localhost? */
-  int			fcntl_mode;	/* Buffered fcntl(sd,F_GETFL) */
-  struct sockaddr_in	local;		/* Local internet address */
-  struct sockaddr_in	remote;		/* Remote internet address */
   enum enum_vio_type	type;		/* Type of connection */
-  char			desc[30];	/* String description */
   void *dest_thd;
   char *packets, **last_packet;
   char *where_in_packet, *end_of_packet;
@@ -56,6 +49,7 @@ struct st_vio
   MEM_ROOT root;
 };
 
+
 /* Initialize the communication buffer */
 
 Vio *vio_new(my_socket sd, enum enum_vio_type type, my_bool localhost)
@@ -68,6 +62,7 @@ Vio *vio_new(my_socket sd, enum enum_vio
     init_alloc_root(&vio->root, 8192, 8192);
     vio->root.min_malloc = sizeof(char *) + 4;
     vio->last_packet = &vio->packets;
+    vio->type = type;
   }
   DBUG_RETURN(vio);
 }
@@ -229,8 +224,28 @@ my_bool vio_poll_read(Vio *vio,uint time
 
 
 void vio_timeout(Vio *vio __attribute__((unused)),
-		 uint which __attribute__((unused)),
 		 uint timeout __attribute__((unused)))
 {
 }
+
+int create_vio(NET *net, int separate_thread)
+{
+  Vio * v  = net->vio;
+  if (!v)
+  {
+    v = vio_new(0, separate_thread ? VIO_CLOSED : VIO_TYPE_TCPIP, 0);
+    net->vio = v;
+  }
+  return !v;
+}
+
+void set_thd(Vio *v, void *thd)
+{
+  if (v)
+  {
+    v -> dest_thd = thd;
+  } 
+}
 #endif /* HAVE_VIO */
+#endif /* DUMMY */
+