diff options
| author | Alexander Nozdrin <alik@sun.com> | 2010-06-26 11:34:02 +0400 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2010-06-26 11:34:02 +0400 |
| commit | 784133260942078047de37dad64c095b4c714d7a (patch) | |
| tree | ef2b6e486eefe520fa2749f8493b4c948f14f609 | |
| parent | 5e0aaa2613bb5394395cb06d7e56a29cd7e952f3 (diff) | |
| parent | e0aba0c84b920dab5d8f726d3fc1c96f8d476a50 (diff) | |
| download | mariadb-git-784133260942078047de37dad64c095b4c714d7a.tar.gz | |
Auto-merge from mysql-trunk.
| -rw-r--r-- | cmake/ssl.cmake | 2 | ||||
| -rw-r--r-- | configure.in | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/cmake/ssl.cmake b/cmake/ssl.cmake index b101c26e241..d1f48888092 100644 --- a/cmake/ssl.cmake +++ b/cmake/ssl.cmake @@ -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_PURE_C -DYASSL_PREFIX -DHAVE_OPENSSL -DYASSL_THREAD_SAFE") CHANGE_SSL_SETTINGS("bundled") #Remove -fno-implicit-templates #(yassl sources cannot be compiled with it) diff --git a/configure.in b/configure.in index 5de43fc7951..78138ac284e 100644 --- a/configure.in +++ b/configure.in @@ -27,7 +27,7 @@ dnl dnl When changing the major version number please also check the switch dnl statement in mysqlbinlog::check_master_version(). You may also need dnl to update version.c in ndb. -AC_INIT([MySQL Server], [5.5.5-m3], [], [mysql]) +AC_INIT([MySQL Server], [5.5.6-m3], [], [mysql]) AC_CONFIG_SRCDIR([sql/mysqld.cc]) AC_CANONICAL_SYSTEM |