bk commit into 5.0 tree (dkatz:1.2530) BUG#29579

[damien]

Below is the list of changes that have just been committed into a local
5.0 repository of dkatz. When dkatz 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-07-13 00:45:54-04:00, dkatz@stripped +5 -0
  Minor fixes for test failures and compiler warnings for Bug #29579.

  BitKeeper/deleted/.del-ssl_big.test@stripped, 2007-07-13 00:23:11-04:00, dkatz@stripped +0 -0
    Delete: mysql-test/t/ssl_big.test

  extra/yassl/include/yassl_int.hpp@stripped, 2007-07-13 00:45:51-04:00, dkatz@stripped +1 -1
    added comment

  extra/yassl/src/yassl_int.cpp@stripped, 2007-07-13 00:45:51-04:00, dkatz@stripped +1 -1
    Changed init order to fix a compiler warning.

  mysql-test/r/mysqltest.result@stripped, 2007-07-13 00:45:51-04:00, dkatz@stripped +1 -1
    There is no limit to connections anymore.

  mysql-test/t/mysqltest.test@stripped, 2007-07-13 00:45:51-04:00, dkatz@stripped +1 -1
    There is no limit to connections anymore.

diff -Nrup a/extra/yassl/include/yassl_int.hpp b/extra/yassl/include/yassl_int.hpp
--- a/extra/yassl/include/yassl_int.hpp	2007-07-12 22:06:31 -04:00
+++ b/extra/yassl/include/yassl_int.hpp	2007-07-13 00:45:51 -04:00
@@ -584,7 +584,7 @@ class SSL {
     Socket              socket_;                // socket wrapper
     Buffers             buffers_;               // buffered handshakes and data
     Log                 log_;                   // logger
-    bool                quietShutdown_;
+    bool                quietShutdown_;         // shutdown without handshakes
 
     // optimization variables
     bool                has_data_;              // buffered data ready?
diff -Nrup a/extra/yassl/src/yassl_int.cpp b/extra/yassl/src/yassl_int.cpp
--- a/extra/yassl/src/yassl_int.cpp	2007-07-12 22:06:31 -04:00
+++ b/extra/yassl/src/yassl_int.cpp	2007-07-13 00:45:51 -04:00
@@ -291,7 +291,7 @@ const ClientKeyFactory& sslFactory::getC
 SSL::SSL(SSL_CTX* ctx) 
     : secure_(ctx->getMethod()->getVersion(), crypto_.use_random(),
               ctx->getMethod()->getSide(), ctx->GetCiphers(), ctx,
-              ctx->GetDH_Parms().set_), has_data_(false), quietShutdown_(false)
+              ctx->GetDH_Parms().set_), quietShutdown_(false), has_data_(false)
 {
     if (int err = crypto_.get_random().GetError()) {
         SetError(YasslError(err));
diff -Nrup a/mysql-test/r/mysqltest.result b/mysql-test/r/mysqltest.result
--- a/mysql-test/r/mysqltest.result	2007-06-19 05:07:37 -04:00
+++ b/mysql-test/r/mysqltest.result	2007-07-13 00:45:51 -04:00
@@ -420,7 +420,7 @@ mysqltest: At line 1: query 'connect  co
 mysqltest: At line 1: Illegal argument for port: 'illegal_port'
 mysqltest: At line 1: Illegal option to connect: SMTP
 OK
-mysqltest: In included file "MYSQLTEST_VARDIR/tmp/mysqltest.sql": At line 7: Connection limit exhausted, you can have max 128 connections
+mysqltest: The test didn't produce any output
 mysqltest: In included file "MYSQLTEST_VARDIR/tmp/mysqltest.sql": At line 3: connection 'test_con1' not found in connection pool
 mysqltest: In included file "MYSQLTEST_VARDIR/tmp/mysqltest.sql": At line 2: Connection test_con1 already exists
 connect(localhost,root,,test,MASTER_PORT,MASTER_SOCKET);
diff -Nrup a/mysql-test/t/mysqltest.test b/mysql-test/t/mysqltest.test
--- a/mysql-test/t/mysqltest.test	2007-06-19 05:34:49 -04:00
+++ b/mysql-test/t/mysqltest.test	2007-07-13 00:45:51 -04:00
@@ -1263,7 +1263,7 @@ while ($i)
 EOF
 --exec echo "source $MYSQLTEST_VARDIR/tmp/mysqltest.sql; echo OK;" | $MYSQL_TEST 2>&1
 
-# Repeat connect/disconnect, exceed max number of connections
+# Repeat connect/disconnect
 --write_file $MYSQLTEST_VARDIR/tmp/mysqltest.sql
 let $i=200;
 while ($i)
diff -Nrup a/mysql-test/t/ssl_big.test b/mysql-test/t/ssl_big.test
--- a/mysql-test/t/ssl_big.test	2007-07-12 21:11:49 -04:00
+++ /dev/null	Wed Dec 31 16:00:00 196900
@@ -1,62 +0,0 @@
-# Turn on ssl between the client and server
-# and run a number of tests
-
--- source include/have_ssl.inc
-
-connect (ssl_con,localhost,root,,,,,SSL);
-
-# Check ssl turned on
-SHOW STATUS LIKE 'Ssl_cipher';
-
-# Source select test case
--- source include/common-tests.inc
-
-# Check ssl turned on
-SHOW STATUS LIKE 'Ssl_cipher';
-
-disconnect ssl_con;
-
-
-#
-# Bug #29579 Clients using SSL can hang the server
-#
-
-connect (ssl_con,localhost,root,,,,,SSL);
-
-create table t1 (a int);
-
-disconnect ssl_con;
-
-let $count= 2000;
-while ($count)
-{
-
-  connect (ssl_con,localhost,root,,,,,SSL);
-
-  let $i= 1;
-  while ($i)
-  {
-    eval insert into t1 values ($count);
-    dec $count;
-    dec $i;
-  }
-  
-  # This select causes the net buffer to fill as the server sends the results 
-  # but the client doesn't reap the results. The results are larger each time
-  # through the loop, so that eventually the buffer is completely full
-  # at the exact moment the server attempts to the close the connection with
-  # the lock held.
-  send select * from t1;
-  
-  # now send the quit the command so the server will initiate the shutdown.
-  send_quit ssl_con; 
-  
-  # if the server is hung, this will hang too:
-  connect (ssl_con2,localhost,root,,,,,SSL);
-  
-  # no hang if we get here, close and retry
-  disconnect ssl_con2;
-  
-  disconnect ssl_con;
-}
-