Merge lp:~ignacio-nin/percona-server/5.5-jemalloc into lp:percona-server/5.5

[Ignacio Nin]

Include a --with-jemalloc option in the binary builder so it includes libjemalloc.so.1 when specified. --with-jemalloc should point to the directory with the source.

[Vadim Tkachenko (vadim-tk)]

ok to include as an option

review: Approve

[Laurynas Biveinis (laurynas-biveinis)]

Why this has been merged without a 5.6 MP?

=== modified file 'build/build-binary.sh'
--- build/build-binary.sh	2013-02-06 10:45:19 +0000
+++ build/build-binary.sh	2013-02-20 18:59:47 +0000
@@ -18,6 +18,7 @@
 QUIET='VERBOSE=1'
 CMAKE_BUILD_TYPE='RelWithDebInfo'
 DEBUG_COMMENT=''
+WITH_JEMALLOC=''
 
 # Some programs that may be overriden
 TAR=${TAR:-tar}
@@ -25,7 +26,8 @@
 # Check if we have a functional getopt(1)
 if ! getopt --test
 then
-    go_out="$(getopt --options="iqdv" --longoptions=i686,quiet,debug,valgrind \
+    go_out="$(getopt --options=iqdvj: \
+        --longoptions=i686,quiet,debug,valgrind,with-jemalloc: \
         --name="$(basename "$0")" -- "$@")"
     test $? -eq 0 || exit 1
     eval set -- $go_out
@@ -54,6 +56,11 @@
         shift
         QUIET=''
         ;;
+    -j | --with-jemalloc )
+        shift
+        WITH_JEMALLOC="$1"
+        shift
+        ;;
     esac
 done
 
@@ -117,6 +124,19 @@
 INSTALLDIR="$(cd "$WORKDIR" && TMPDIR="$WORKDIR_ABS" mktemp -d percona-build.XXXXXX)"
 INSTALLDIR="$WORKDIR_ABS/$INSTALLDIR"   # Make it absolute
 
+# Test jemalloc directory
+if test "x$WITH_JEMALLOC" != "x"
+then
+    if ! test -d "$WITH_JEMALLOC"
+    then
+        echo >&2 "Jemalloc dir $WITH_JEMALLOC does not exist"
+        exit 1
+    fi
+    
+    JEMALLOCDIR="$(cd "$WITH_JEMALLOC"; pwd)"
+
+fi
+
 # Build
 (
     cd "$SOURCEDIR"
@@ -162,6 +182,23 @@
 
     )
 
+    # Build jemalloc
+    if test "x$WITH_JEMALLOC" != x
+    then
+    (
+        cd "$JEMALLOCDIR"
+
+        ./configure --prefix="/usr/local/$PRODUCT_FULL/" \
+                --libdir="/usr/local/$PRODUCT_FULL/lib/mysql/"
+        make
+        make DESTDIR="$INSTALLDIR" install_lib_shared
+
+        # Copy COPYING file
+        cp COPYING "$INSTALLDIR/usr/local/$PRODUCT_FULL/COPYING-jemalloc"
+
+    )
+    fi
+
 )
 
 # Package the archive