MySQL Lists are EOL. Please join:

List:Internals« Previous MessageNext Message »
From:msvensson Date:September 1 2005 9:46am
Subject:bk commit into 5.0 tree (msvensson:1.1918) BUG#11286
View as plain text  
Below is the list of changes that have just been committed into a local
5.0 repository of msvensson. When msvensson 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
  1.1918 05/09/01 11:46:43 msvensson@neptunus.(none) +5 -0
  Bug #11286  	yassl incompatible with "load data infile"
   - Make sure that mysqltest always uses ssl when connecting to the server.
   - Pass a i32-bit int variable as argument to FIONREAD ioctl.

  vio/viosslfactories.c
    1.18 05/09/01 11:46:37 msvensson@neptunus.(none) +0 -6
    Remove DBUG_PRINT("enter" in sslaccept and sslconnect as it tries to print out null strings. That is not suported on all platforms.

  vio/viossl.c
    1.28 05/09/01 11:46:37 msvensson@neptunus.(none) +4 -3
    Minor fixes
    Add timeout to DBUG_PRINT
    use function vio_ssl_fd to get sd from vio
    Remove extra whitespace

  sql/sql_parse.cc
    1.474 05/09/01 11:46:37 msvensson@neptunus.(none) +2 -3
    Update error message when sslaccepts fails. Must have been a copy and paste error.

  extra/yassl/src/socket_wrapper.cpp
    1.6 05/09/01 11:46:37 msvensson@neptunus.(none) +6 -2
    64-bit Solaris requires the variable passed to FIONREAD be a 32-bit value.
    Using "int" unless _WIN32_ is defined.

  client/mysqltest.c
    1.155 05/09/01 11:46:37 msvensson@neptunus.(none) +1 -1
    Set the flag CLIENT_REMENBER_OPTIONS so that all connection attempts from mysqltest is done with the same settings.
    Old impl caused mysqltest to loose all it's settings in the second connection attempt, ex ssl settings.

# 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:	msvensson
# Host:	neptunus.(none)
# Root:	/home/msvensson/mysql/bug11286/my50-bug11286

--- 1.473/sql/sql_parse.cc	2005-08-24 01:43:16 +02:00
+++ 1.474/sql/sql_parse.cc	2005-09-01 11:46:37 +02:00
@@ -919,8 +919,7 @@
     DBUG_PRINT("info", ("IO layer change in progress..."));
     if (sslaccept(ssl_acceptor_fd, net->vio, thd->variables.net_wait_timeout))
     {
-      DBUG_PRINT("error", ("Failed to read user information (pkt_len= %lu)",
-			   pkt_len));
+      DBUG_PRINT("error", ("Failed to accept new SSL connection"));
       inc_host_errors(&thd->remote.sin_addr);
       return(ER_HANDSHAKE_ERROR);
     }
@@ -3449,7 +3448,7 @@
     if (lex->local_file)
     {
       if (!(thd->client_capabilities & CLIENT_LOCAL_FILES) ||
-	  ! opt_local_infile)
+          !opt_local_infile)
       {
 	my_message(ER_NOT_ALLOWED_COMMAND, ER(ER_NOT_ALLOWED_COMMAND), MYF(0));
 	goto error;

--- 1.154/client/mysqltest.c	2005-08-11 13:02:39 +02:00
+++ 1.155/client/mysqltest.c	2005-09-01 11:46:37 +02:00
@@ -1741,7 +1741,7 @@
   for (i = 0; i < MAX_CON_TRIES; ++i)
   {
     if (mysql_real_connect(con, host,user, pass, db, port, sock,
-			   CLIENT_MULTI_STATEMENTS))
+			   CLIENT_MULTI_STATEMENTS | CLIENT_REMEMBER_OPTIONS))
     {
       con_error = 0;
       break;

--- 1.5/extra/yassl/src/socket_wrapper.cpp	2005-07-01 17:00:54 +02:00
+++ 1.6/extra/yassl/src/socket_wrapper.cpp	2005-09-01 11:46:37 +02:00
@@ -93,11 +93,15 @@
 
 uint Socket::get_ready() const
 {
-    unsigned long ready = 0;
-
 #ifdef _WIN32
+    unsigned long ready = 0;
     ioctlsocket(socket_, FIONREAD, &ready);
 #else
+    /*
+      64-bit Solaris requires the variable passed to
+      FIONREAD be a 32-bit value.
+    */
+    int ready = 0;
     ioctl(socket_, FIONREAD, &ready);
 #endif
 

--- 1.27/vio/viossl.c	2005-07-12 10:07:13 +02:00
+++ 1.28/vio/viossl.c	2005-09-01 11:46:37 +02:00
@@ -283,9 +283,10 @@
   X509* client_cert;
   my_bool unused;
   my_bool net_blocking;
-  enum enum_vio_type old_type;  
+  enum enum_vio_type old_type;
   DBUG_ENTER("sslaccept");
-  DBUG_PRINT("enter", ("sd: %d  ptr: Ox%p", vio->sd,ptr));
+  DBUG_PRINT("enter", ("sd: %d  ptr: Ox%p, timeout: %d",
+                       vio->sd, ptr, timeout));
 
   old_type= vio->type;
   net_blocking = vio_is_blocking(vio);
@@ -379,7 +380,7 @@
                       (SSL*) vio->ssl_arg, timeout));
   SSL_clear((SSL*) vio->ssl_arg);
   SSL_SESSION_set_timeout(SSL_get_session((SSL*) vio->ssl_arg), timeout);
-  SSL_set_fd ((SSL*) vio->ssl_arg, vio->sd);
+  SSL_set_fd ((SSL*) vio->ssl_arg, vio_ssl_fd(vio));
   SSL_set_connect_state((SSL*) vio->ssl_arg);
   if (SSL_do_handshake((SSL*) vio->ssl_arg) < 1)
   {

--- 1.17/vio/viosslfactories.c	2004-12-18 04:19:16 +01:00
+++ 1.18/vio/viosslfactories.c	2005-09-01 11:46:37 +02:00
@@ -219,9 +219,6 @@
   int result;
   DH *dh;
   DBUG_ENTER("new_VioSSLConnectorFd");
-  DBUG_PRINT("enter",
-	     ("key_file: %s, cert_file: %s, ca_path: %s, ca_file: %s, cipher: %s",
-	      key_file, cert_file, ca_path, ca_file, cipher));
 
   if (!(ptr=((struct st_VioSSLConnectorFd*)
 	     my_malloc(sizeof(struct st_VioSSLConnectorFd),MYF(0)))))
@@ -314,9 +311,6 @@
   int result;
   DH *dh;
   DBUG_ENTER("new_VioSSLAcceptorFd");
-  DBUG_PRINT("enter",
-	     ("key_file: %s, cert_file: %s, ca_path: %s, ca_file: %s, cipher: %s",
-	      key_file, cert_file, ca_path, ca_file, cipher));
 
   ptr= ((struct st_VioSSLAcceptorFd*)
 	my_malloc(sizeof(struct st_VioSSLAcceptorFd),MYF(0)));
Thread
bk commit into 5.0 tree (msvensson:1.1918) BUG#11286msvensson1 Sep