List:Commits« Previous MessageNext Message »
From:Nirbhay Choubey Date:June 5 2012 12:04pm
Subject:bzr push into mysql-trunk branch (nirbhay.choubey:3962 to 3963) WL#5603
View as plain text  
 3963 Nirbhay Choubey	2012-06-05
      WL#5603 : Revise how we handle passwords on
                the command line
      
      Fix for some build failures.

    modified:
      mysys_ssl/CMakeLists.txt
      support-files/mysql.spec.sh
 3962 Rohit Kalhans	2012-06-05
      diabling i_binlog.binlog_mysqlbinlog_file_write from daily and weekly runs

    modified:
      mysql-test/collections/disabled-daily.list
      mysql-test/collections/disabled-weekly.list
=== modified file 'mysys_ssl/CMakeLists.txt'
--- a/mysys_ssl/CMakeLists.txt	2012-05-31 15:33:21 +0000
+++ b/mysys_ssl/CMakeLists.txt	2012-06-05 12:03:10 +0000
@@ -21,6 +21,14 @@ IF(SSL_DEFINES)
 ADD_DEFINITIONS(${SSL_DEFINES})
 ENDIF()
 
+# We do RESTRICT_SYMBOL_EXPORTS(yassl) elsewhere.
+# In order to get correct symbol visibility, my_aes.cc
+# must be compiled with "-fvisibility=hidden"
+IF(HAVE_VISIBILITY_HIDDEN)
+  SET_SOURCE_FILES_PROPERTIES(my_aes.cc
+    PROPERTIES COMPILE_FLAGS "-fvisibility=hidden")
+ENDIF()
+
 SET(MYSYS_SSL_SOURCES default.c my_getopt.c my_aes.cc)
 
 ADD_CONVENIENCE_LIBRARY(mysys_ssl ${MYSYS_SSL_SOURCES})

=== modified file 'support-files/mysql.spec.sh'
--- a/support-files/mysql.spec.sh	2012-03-14 01:50:20 +0000
+++ b/support-files/mysql.spec.sh	2012-06-05 12:03:10 +0000
@@ -1049,6 +1049,7 @@ echo "====="
 %attr(755, root, root) %{_bindir}/mysqlimport
 %attr(755, root, root) %{_bindir}/mysqlshow
 %attr(755, root, root) %{_bindir}/mysqlslap
+%attr(755, root, root) %{_bindir}/mysql_config_editor
 
 %doc %attr(644, root, man) %{_mandir}/man1/msql2mysql.1*
 %doc %attr(644, root, man) %{_mandir}/man1/mysql.1*

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-trunk branch (nirbhay.choubey:3962 to 3963) WL#5603Nirbhay Choubey5 Jun