4180 Tor Didriksen 2012-08-07 [merge]
merge 5.6 => trunk
renamed:
sql-common/crypt_genhash_impl.cc => mysys_ssl/crypt_genhash_impl.cc
modified:
cmake/libutils.cmake
libmysql/CMakeLists.txt
libmysqld/CMakeLists.txt
mysys_ssl/CMakeLists.txt
sql/CMakeLists.txt
4179 Chaithra Gopalareddy 2012-08-07 [merge]
Null merge from 5.6 to trunk
=== modified file 'cmake/libutils.cmake'
--- a/cmake/libutils.cmake 2012-04-02 14:31:07 +0000
+++ b/cmake/libutils.cmake 2012-08-07 05:14:58 +0000
@@ -286,6 +286,8 @@ FUNCTION(GET_DEPENDEND_OS_LIBS target re
SET(${result} ${ret} PARENT_SCOPE)
ENDFUNCTION()
+# We try to hide the symbols in yassl/zlib to avoid name clashes with
+# other libraries like openssl.
FUNCTION(RESTRICT_SYMBOL_EXPORTS target)
IF(CMAKE_COMPILER_IS_GNUCXX AND UNIX)
SET(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -Werror")
=== modified file 'libmysql/CMakeLists.txt'
--- a/libmysql/CMakeLists.txt 2012-06-28 13:48:07 +0000
+++ b/libmysql/CMakeLists.txt 2012-08-07 05:14:58 +0000
@@ -143,21 +143,12 @@ SET(CLIENT_SOURCES
../sql-common/client.c
../sql-common/my_time.c
../sql-common/client_plugin.c
- ../sql-common/crypt_genhash_impl.cc
../sql-common/client_authentication.cc
../sql/net_serv.cc
../sql-common/pack.c
../sql/password.c
)
-# We do RESTRICT_SYMBOL_EXPORTS(yassl) elsewhere.
-# In order to get correct symbol visibility, md5.cc and sha1.cc
-# must be compiled with "-fvisibility=hidden"
-IF(HAVE_VISIBILITY_HIDDEN)
- SET_SOURCE_FILES_PROPERTIES(../sql-common/crypt_genhash_impl.cc
- PROPERTIES COMPILE_FLAGS "-fvisibility=hidden")
-ENDIF()
-
ADD_CONVENIENCE_LIBRARY(clientlib ${CLIENT_SOURCES})
DTRACE_INSTRUMENT(clientlib)
ADD_DEPENDENCIES(clientlib GenError)
=== modified file 'libmysqld/CMakeLists.txt'
--- a/libmysqld/CMakeLists.txt 2012-06-09 13:16:21 +0000
+++ b/libmysqld/CMakeLists.txt 2012-08-07 05:14:58 +0000
@@ -42,16 +42,6 @@ FOREACH(file ${SQL_EXPORTED_SOURCES})
LIST(APPEND IMPORTED_SOURCES "../sql/${file}")
ENDFOREACH()
-# We do RESTRICT_SYMBOL_EXPORTS(yassl) elsewhere.
-# In order to get correct symbol visibility, md5.cc and sha1.cc
-# must be compiled with "-fvisibility=hidden"
-IF(HAVE_VISIBILITY_HIDDEN)
- SET_SOURCE_FILES_PROPERTIES(../sql/md5.cc
- PROPERTIES COMPILE_FLAGS "-fvisibility=hidden")
- SET_SOURCE_FILES_PROPERTIES(../sql/sha1.cc
- PROPERTIES COMPILE_FLAGS "-fvisibility=hidden")
-ENDIF()
-
SET(SQL_EMBEDDED_SOURCES
emb_qcache.cc
lib_sql.cc
=== modified file 'mysys_ssl/CMakeLists.txt'
--- a/mysys_ssl/CMakeLists.txt 2012-06-28 13:48:07 +0000
+++ b/mysys_ssl/CMakeLists.txt 2012-08-07 05:14:58 +0000
@@ -22,20 +22,20 @@ ADD_DEFINITIONS(${SSL_DEFINES})
ENDIF()
# We do RESTRICT_SYMBOL_EXPORTS(yassl) elsewhere.
-# In order to get correct symbol visibility, my_aes.cc
+# In order to get correct symbol visibility, these files
# must be compiled with "-fvisibility=hidden"
IF(HAVE_VISIBILITY_HIDDEN)
- SET_SOURCE_FILES_PROPERTIES(my_aes.cc
- PROPERTIES COMPILE_FLAGS "-fvisibility=hidden")
- SET_SOURCE_FILES_PROPERTIES(my_md5.cc
- PROPERTIES COMPILE_FLAGS "-fvisibility=hidden")
- SET_SOURCE_FILES_PROPERTIES(my_sha1.cc
- PROPERTIES COMPILE_FLAGS "-fvisibility=hidden")
- SET_SOURCE_FILES_PROPERTIES(my_sha2.cc
+ SET_SOURCE_FILES_PROPERTIES(
+ crypt_genhash_impl.cc
+ my_aes.cc
+ my_md5.cc
+ my_sha1.cc
+ my_sha2.cc
PROPERTIES COMPILE_FLAGS "-fvisibility=hidden")
ENDIF()
SET(MYSYS_SSL_SOURCES
+ crypt_genhash_impl.cc
my_default.cc
my_getopt.cc
my_aes.cc
=== renamed file 'sql-common/crypt_genhash_impl.cc' => 'mysys_ssl/crypt_genhash_impl.cc'
=== modified file 'sql/CMakeLists.txt'
--- a/sql/CMakeLists.txt 2012-06-28 13:48:07 +0000
+++ b/sql/CMakeLists.txt 2012-08-07 05:14:58 +0000
@@ -84,7 +84,6 @@ SET(SQL_SHARED_SOURCES
parse_file.cc
partition_info.cc
password.c
- ../sql-common/crypt_genhash_impl.cc
procedure.cc
protocol.cc
records.cc
No bundle (reason: useless for push emails).
Thread |
---|
• bzr push into mysql-trunk branch (tor.didriksen:4179 to 4180) | Tor Didriksen | 7 Aug |