From: Harin Vadodaria
Date: August 7 2012 11:06am
Subject: bzr push into mysql-trunk branch (harin.vadodaria:4182 to 4183) Bug#14068244
List-Archive: http://lists.mysql.com/commits/144530
X-Bug: 14068244
Message-Id: <20120807110610.11262.11953.4183@hvadodar-ThinkPad-T420>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 4183 Harin Vadodaria	2012-08-07 [merge]
      Bug#14068244: INCOMPATIBILITY BETWEEN LIBMYSQLCLIENT/LIBMYSQLCLIENT_R
                    AND LIBCRYPTO
      
      Description: Merge from MySQL-5.6 to MySQL-trunk

    removed:
      extra/yassl/taocrypt/src/crypto.cpp
 4182 Chaithra Gopalareddy	2012-08-07 [merge]
      Null merge from 5.6 to mysql-trunk

=== removed file 'extra/yassl/taocrypt/src/crypto.cpp'
--- a/extra/yassl/taocrypt/src/crypto.cpp	2012-07-24 13:24:00 +0000
+++ b/extra/yassl/taocrypt/src/crypto.cpp	1970-01-01 00:00:00 +0000
@@ -1,37 +0,0 @@
-/*
-   Copyright (C) 2000-2007 MySQL AB
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-   MA  02110-1301  USA.
-*/
-
-/* put features that other apps expect from OpenSSL type crypto */
-
-
-
-extern "C" {
-
-    // for libcurl configure test, these are the signatures they use
-    // locking handled internally by library
-    char CRYPTO_lock() { return 0;}
-    char CRYPTO_add_lock() { return 0;}
-
-
-    // for openvpn, test are the signatures they use
-    char EVP_CIPHER_CTX_init() { return 0; }
-    char CRYPTO_mem_ctrl() { return 0; }
-}  // extern "C"
-
-
-

No bundle (reason: useless for push emails).