List:Commits« Previous MessageNext Message »
From:Mikael Ronstrom Date:December 27 2011 12:04pm
Subject:bzr push into mysql-5.5-cluster-7.2 branch (mikael.ronstrom:3680 to 3681)
View as plain text  
 3681 Mikael Ronstrom	2011-12-27
      Fixed build script for platforms with problems with static linking

    modified:
      BUILD/build_mccge.sh
 3680 Mikael Ronström	2011-12-27
      Decrease pressure on sendbufferpool lock

    modified:
      storage/ndb/src/kernel/vm/mt.cpp
=== modified file 'BUILD/build_mccge.sh'
--- a/BUILD/build_mccge.sh	revid:mikael@dator9-20111227115002-4bsjkdj7yym65bg3
+++ b/BUILD/build_mccge.sh	revid:mikael.ronstrom@oracle.com-20111227120000-7v7w3me381wwmpr7
@@ -856,6 +856,9 @@ parse_options()
     --static-linking)
       static_linking_flag="yes"
       ;;
+    --no-static-linking)
+      static_linking_flag="no"
+      ;;
     --strip)
       strip_flag="yes"
       ;;
@@ -1763,8 +1766,10 @@ set_static_link_configs()
     loc_static_link="--with-mysqld-ldflags=\"-all-static\""
     loc_static_link="$loc_static_link --with-client-ldflags=\"-all-static\""
   else
-    loc_static_link="--with-mysqld-ldflags=\"-static\""
-    loc_static_link="$loc_static_link --with-client-ldflags=\"-static\""
+    if test "x$static_linking_flag" != "xno" ; then
+      loc_static_link="--with-mysqld-ldflags=\"-static\""
+      loc_static_link="$loc_static_link --with-client-ldflags=\"-static\""
+    fi
   fi
   base_configs="$base_configs $loc_static_link"
 }

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-5.5-cluster-7.2 branch (mikael.ronstrom:3680 to 3681) Mikael Ronstrom29 Dec