List:Commits« Previous MessageNext Message »
From:Tor Didriksen Date:March 22 2012 3:15pm
Subject:bzr push into mysql-trunk branch (tor.didriksen:3835 to 3836) WL#5825
View as plain text  
 3836 Tor Didriksen	2012-03-22
      WL#5825 Using C++ Standard Library with MySQL code
      
      No need to specify -DYASSL_PURE_C anymore.
     @ cmake/ssl.cmake
        Removing YASSL_PURE_C means we will be using std::operator new
        rather than yaSSL::operator new(size_t, yaSSL::new_t)
     @ support-files/build-tags
        Tag *.hpp files also.

    modified:
      cmake/ssl.cmake
      support-files/build-tags
 3835 Marko Mäkelä	2012-03-22
      Temporarily avoid hitting Bug#13875241 on Valgrind.

    modified:
      mysql-test/suite/innodb/t/innodb-index-online.test
=== modified file 'cmake/ssl.cmake'
--- a/cmake/ssl.cmake	2011-06-30 15:50:45 +0000
+++ b/cmake/ssl.cmake	2012-03-22 15:15:32 +0000
@@ -25,7 +25,7 @@ MACRO (MYSQL_USE_BUNDLED_SSL)
   SET(SSL_LIBRARIES  yassl taocrypt)
   SET(SSL_INCLUDE_DIRS ${INC_DIRS})
   SET(SSL_INTERNAL_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/extra/yassl/taocrypt/mySTL)
-  SET(SSL_DEFINES "-DHAVE_YASSL -DYASSL_PURE_C -DYASSL_PREFIX -DHAVE_OPENSSL -DYASSL_THREAD_SAFE")
+  SET(SSL_DEFINES "-DHAVE_YASSL -DYASSL_PREFIX -DHAVE_OPENSSL -DYASSL_THREAD_SAFE")
   CHANGE_SSL_SETTINGS("bundled")
   ADD_SUBDIRECTORY(extra/yassl)
   ADD_SUBDIRECTORY(extra/yassl/taocrypt)

=== modified file 'support-files/build-tags'
--- a/support-files/build-tags	2011-09-06 12:43:05 +0000
+++ b/support-files/build-tags	2012-03-22 15:15:32 +0000
@@ -1,7 +1,7 @@
 #! /bin/sh
 
 rm -f TAGS
-filter='\.cpp$\|\.cc$\|\.c$\|\.h$\|\.yy$'
+filter='\.cpp$\|\.cc$\|\.c$\|\.h$\|\.yy$\|\.hpp$'
 
 list="find . -type f"
 bzr root >/dev/null 2>/dev/null && list="bzr ls --from-root -R --kind=file --versioned"

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-trunk branch (tor.didriksen:3835 to 3836) WL#5825Tor Didriksen22 Mar