[prev in list] [next in list] [prev in thread] [next in thread] 

List:       mysql-internals
Subject:    bk commit into 4.0 tree
From:       tonu () mysql ! com
Date:       2001-08-31 22:57:12
[Download RAW message or body]

Below is the list of changes that have just been committed into a
4.0 repository of tonu. When tonu does a push, they will be propogated 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.767, 2001-09-01 06:57:08+08:00, tonu@x153.internalnet
  Yet another SSL fixes

  mysql-test/include/have_openssl_1.inc
    1.1 01/09/01 06:57:07 tonu@x153.internalnet +2 -0

  mysql-test/include/have_openssl_2.inc
    1.1 01/09/01 06:57:07 tonu@x153.internalnet +2 -0

  mysql-test/r/have_openssl_1.require
    1.1 01/09/01 06:57:07 tonu@x153.internalnet +2 -0

  mysql-test/r/have_openssl_2.require
    1.1 01/09/01 06:57:07 tonu@x153.internalnet +2 -0

  mysql-test/include/have_openssl_1.inc
    1.0 01/09/01 06:57:07 tonu@x153.internalnet +0 -0
    BitKeeper file /home/tonu/mysql-4.0/mysql-test/include/have_openssl_1.inc

  mysql-test/include/have_openssl_2.inc
    1.0 01/09/01 06:57:07 tonu@x153.internalnet +0 -0
    BitKeeper file /home/tonu/mysql-4.0/mysql-test/include/have_openssl_2.inc

  mysql-test/r/have_openssl_1.require
    1.0 01/09/01 06:57:07 tonu@x153.internalnet +0 -0
    BitKeeper file /home/tonu/mysql-4.0/mysql-test/r/have_openssl_1.require

  mysql-test/r/have_openssl_2.require
    1.0 01/09/01 06:57:07 tonu@x153.internalnet +0 -0
    BitKeeper file /home/tonu/mysql-4.0/mysql-test/r/have_openssl_2.require

  mysql-test/t/openssl_1.test
    1.3 01/09/01 06:57:07 tonu@x153.internalnet +1 -0
    SSL fix

  mysql-test/t/openssl_2.test
    1.4 01/09/01 06:57:07 tonu@x153.internalnet +1 -1
    SSL fix

  sql/mysqld.cc
    1.210 01/09/01 06:57:07 tonu@x153.internalnet +1 -1
    C

# 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:	tonu
# Host:	x153.internalnet
# Root:	/home/tonu/mysql-4.0

--- 1.209/sql/mysqld.cc	Sat Sep  1 06:30:05 2001
+++ 1.210/sql/mysqld.cc	Sat Sep  1 06:57:07 2001
@@ -1991,7 +1991,7 @@
     if(hEventShutdown) CloseHandle(hEventShutdown);
   }
 #endif
-
+  my_free((gptr)ssl_acceptor_fd,MYF(0));
   /* Wait until cleanup is done */
   (void) pthread_mutex_lock(&LOCK_thread_count);
   while (!ready_to_exit)
--- New file ---
+++ mysql-test/include/have_openssl_1.inc	01/09/01 06:57:07
-- require r/have_openssl_1.require
show variables like "have_openssl";

--- New file ---
+++ mysql-test/include/have_openssl_2.inc	01/09/01 06:57:07
-- require r/have_openssl_2.require
SHOW STATUS LIKE "SSL_get_cipher";

--- New file ---
+++ mysql-test/r/have_openssl_1.require	01/09/01 06:57:07
Variable_name	Value
have_openssl	YES

--- New file ---
+++ mysql-test/r/have_openssl_2.require	01/09/01 06:57:07
Variable_name	Value
jkhjkhfs


--- 1.3/mysql-test/t/openssl_2.test	Sat Sep  1 06:30:05 2001
+++ 1.4/mysql-test/t/openssl_2.test	Sat Sep  1 06:57:07 2001
@@ -1,5 +1,5 @@
 # We want to test everything with SSL turned on. 
--- source include/have_openssl.inc 
+-- source include/have_openssl_2.inc 
 
 SHOW STATUS LIKE 'SSL%';
 

--- 1.2/mysql-test/t/openssl_1.test	Sat Sep  1 05:36:06 2001
+++ 1.3/mysql-test/t/openssl_1.test	Sat Sep  1 06:57:07 2001
@@ -1,5 +1,6 @@
 # We test openssl. Result set is optimized to be compiled with --with-openssl but 
 # SSL is swithced off in some reason
+-- source include/have_openssl_2.inc
 
 SHOW STATUS LIKE 'SSL%';
 

---------------------------------------------------------------------
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-thread1627@lists.mysql.com
To unsubscribe, e-mail <internals-unsubscribe@lists.mysql.com>

[prev in list] [next in list] [prev in thread] [next in thread]