29 files changed, 6 insertions, 229 deletions
diff --git a/BUILD/FINISH.sh b/BUILD/FINISH.sh
index 4f90e53a54b..037b5ae5754 100644
--- a/BUILD/FINISH.sh
+++ b/BUILD/FINISH.sh
@@ -51,6 +51,7 @@ path=`dirname $0`
 if [ -z "$just_clean" ]
 then
 commands="$commands
+git submodule update
 CC=\"$CC\" CFLAGS=\"$cflags\" CXX=\"$CXX\" CXXFLAGS=\"$cxxflags\" CXXLDFLAGS=\"$CXXLDFLAGS\" $configure"
 fi
 
diff --git a/BUILD/SETUP.sh b/BUILD/SETUP.sh
index 4762709e1f3..2288f149d37 100755
--- a/BUILD/SETUP.sh
+++ b/BUILD/SETUP.sh
@@ -122,7 +122,8 @@ get_make_parallel_flag
 # SSL library to use.--with-ssl will select our bundled yaSSL
 # implementation of SSL. --with-ssl=yes will first try system library
 # then the boundled one  --with-ssl=system will use the system library.
-SSL_LIBRARY=--with-ssl=system
+# We use bundled by default as this is guaranteed to work with Galera
+SSL_LIBRARY=--with-ssl
 
 if [ "x$warning_mode" = "xpedantic" ]; then
   warnings="-W -Wall -ansi -pedantic -Wno-long-long -Wno-unused -D_POSIX_SOURCE"
@@ -140,7 +141,7 @@ elif [ "x$warning_mode" = "xmaintainer" ]; then
   debug_extra_cflags="-g3"
 else
 # Both C and C++ warnings
-  warnings="-Wall -Wextra -Wunused -Wwrite-strings -Wno-uninitialized"
+  warnings="-Wall -Wextra -Wunused -Wwrite-strings -Wno-uninitialized -Wno-strict-aliasing"
 
 # For more warnings, uncomment the following line
 # warnings="$warnings -Wshadow"
@@ -194,6 +195,8 @@ base_configs="$base_configs --with-extra-charsets=complex "
 base_configs="$base_configs --enable-thread-safe-client "
 base_configs="$base_configs --with-big-tables $maintainer_mode"
 base_configs="$base_configs --with-plugin-aria --with-aria-tmp-tables"
+# Following is to get tokudb to work
+base_configs="$base_configs --with-jemalloc=NO"
 
 if test -d "$path/../cmd-line-utils/readline"
 then
diff --git a/BUILD/compile-alpha b/BUILD/compile-alpha
deleted file mode 100755
index cb3c4478acb..00000000000
--- a/BUILD/compile-alpha
+++ /dev/null
@@ -1,24 +0,0 @@
-#! /bin/sh
-
-# Copyright (C) 2000, 2002 MySQL AB
-# Use is subject to license terms
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-# 
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1335  USA
-
-path=`dirname $0`
-. "$path/SETUP.sh"
-
-extra_flags="$alpha_cflags $fast_cflags"
-extra_configs="$alpha_configs $static_link"
-
-. "$path/FINISH.sh"
diff --git a/BUILD/compile-alpha-debug b/BUILD/compile-alpha-debug
deleted file mode 100755
index 2d8869227dc..00000000000
--- a/BUILD/compile-alpha-debug
+++ /dev/null
@@ -1,12 +0,0 @@
-#! /bin/sh
-
-/bin/rm -f */.deps/*.P */*.o
-make -k maintainer-clean
-/bin/rm -f */.deps/*.P */*.o
-/bin/rm -f */.deps/*.P config.cache storage/innobase/config.cache mysql-*.tar.gz
-
-path=`dirname $0`
-. "$path/autorun.sh"
-
-CFLAGS=-O1 CC=gcc CXX=g++ CXXFLAGS="-O1 -felide-constructors -fno-exceptions -fno-rtti" ./configure --prefix=/usr/local/mysql --with-debug --with-extra-charsets=complex  --without-extra-tools
-make
diff --git a/BUILD/compile-amd64-debug-wsrep b/BUILD/compile-amd64-debug-wsrep
index 995a8afcca9..995a8afcca9 100644..100755
--- a/BUILD/compile-amd64-debug-wsrep
+++ b/BUILD/compile-amd64-debug-wsrep
diff --git a/BUILD/compile-amd64-wsrep b/BUILD/compile-amd64-wsrep
index 57dfbdd6da2..57dfbdd6da2 100644..100755
--- a/BUILD/compile-amd64-wsrep
+++ b/BUILD/compile-amd64-wsrep
diff --git a/BUILD/compile-ia64-debug-max b/BUILD/compile-ia64-debug-max
deleted file mode 100755
index 415d3cec7a6..00000000000
--- a/BUILD/compile-ia64-debug-max
+++ /dev/null
@@ -1,25 +0,0 @@
-#! /bin/sh
-
-# Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
-# 
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-# 
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA
-
-gmake -k maintainer-clean || true 
-/bin/rm -f */.deps/*.P config.cache storage/innobase/config.cache
-
-path=`dirname $0`
-. "$path/autorun.sh"
-
-CC=ecc CFLAGS="-w1 -DEXTRA_DEBUG -DSAFE_MUTEX -O2" CXX=ecc CXXFLAGS="-w1 -DEXTRA_DEBUG -DSAFE_MUTEX -O2" ./configure --prefix=/usr/local/mysql --with-extra-charsets=complex --enable-thread-safe-client --with-mysqld-ldflags=-all-static  --with-client-ldflags=-all-static  --with-debug --with-innodb --with-embedded-server --with-archive-storage-engine
-gmake
diff --git a/BUILD/compile-innodb b/BUILD/compile-innodb
deleted file mode 100755
index b3001061e0a..00000000000
--- a/BUILD/compile-innodb
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/sh
-#
-# Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
-#
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along with
-# this program; if not, write to the Free Software Foundation, Inc., 51 Franklin St,
-# Fifth Floor, Boston, MA 02110-1335 USA
-#
-
-# we assume this script is in storage/innobase/
-
-MYSQL_ROOT="$(dirname ${0})/../.."
-
-cd ${MYSQL_ROOT}
-
-cmake -DWITH_INNOBASE_STORAGE_ENGINE:BOOL=ON
-make -j$(nproc)
diff --git a/BUILD/compile-pentium-debug-all b/BUILD/compile-pentium-debug-all
deleted file mode 100755
index 9ed5bf6b2cd..00000000000
--- a/BUILD/compile-pentium-debug-all
+++ /dev/null
@@ -1,10 +0,0 @@
-#! /bin/sh
-
-path=`dirname $0`
-set -- "$@" --with-debug=full
-. "$path/SETUP.sh"
-
-extra_flags="$pentium_cflags $debug_cflags"
-extra_configs="$pentium_configs $debug_configs $all_configs $error_inject --with-experimental-collations $disable_64_bit_plugins"
-
-. "$path/FINISH.sh"
diff --git a/BUILD/compile-pentium-debug-max-no-embedded b/BUILD/compile-pentium-debug-max-no-embedded
deleted file mode 100755
index 090ffe51847..00000000000
--- a/BUILD/compile-pentium-debug-max-no-embedded
+++ /dev/null
@@ -1,25 +0,0 @@
-#! /bin/sh
-
-# Copyright (c) 2004-2006 MySQL AB
-# Use is subject to license terms
-# 
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-# 
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1335  USA
-
-path=`dirname $0`
-. "$path/SETUP.sh"
-
-extra_flags="$pentium_cflags $debug_cflags"
-extra_configs="$pentium_configs $debug_configs $max_no_embedded_configs $disable_64_bit_plugins"
-
-. "$path/FINISH.sh"
diff --git a/BUILD/compile-pentium-debug-wsrep b/BUILD/compile-pentium-debug-wsrep
deleted file mode 100644
index 6528ed77f95..00000000000
--- a/BUILD/compile-pentium-debug-wsrep
+++ /dev/null
@@ -1,12 +0,0 @@
-#! /bin/sh -x
-
-path=`dirname $0`
-set -- "$@" --with-debug=full
-. "$path/SETUP.sh"
-
-extra_flags="$pentium_cflags $debug_cflags -g -O0 $wsrep_cflags"
-c_warnings="$c_warnings $debug_extra_warnings"
-cxx_warnings="$cxx_warnings $debug_extra_warnings"
-extra_configs="$pentium_configs $debug_configs $wsrep_configs --with-wsrep $disable_64_bit_plugins"
-
-. "$path/FINISH.sh"
diff --git a/BUILD/compile-pentium-debug-yassl b/BUILD/compile-pentium-debug-yassl
deleted file mode 100755
index 0a53e7f9718..00000000000
--- a/BUILD/compile-pentium-debug-yassl
+++ /dev/null
@@ -1,26 +0,0 @@
-#! /bin/sh
-
-# Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
-# 
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-# 
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA
-
-path=`dirname $0`
-. "$path/SETUP.sh"
-
-extra_flags="$pentium_cflags $debug_cflags"
-extra_configs="$pentium_configs $debug_configs"
-
-extra_configs="$extra_configs  --with-debug --with-ssl"
-
-. "$path/FINISH.sh"
diff --git a/BUILD/compile-pentium-icc-yassl b/BUILD/compile-pentium-icc-yassl
index cd4d8dc822e..cd4d8dc822e 100644..100755
--- a/BUILD/compile-pentium-icc-yassl
+++ b/BUILD/compile-pentium-icc-yassl
diff --git a/BUILD/compile-pentium b/BUILD/compile-pentium32
index 84dfbcf3878..84dfbcf3878 100755
--- a/BUILD/compile-pentium
+++ b/BUILD/compile-pentium32
diff --git a/BUILD/compile-pentium-cybozu b/BUILD/compile-pentium32-cybozu
index 4ff01e73a26..4ff01e73a26 100755
--- a/BUILD/compile-pentium-cybozu
+++ b/BUILD/compile-pentium32-cybozu
diff --git a/BUILD/compile-pentium-debug b/BUILD/compile-pentium32-debug
index 3f5e7b50c53..3f5e7b50c53 100755
--- a/BUILD/compile-pentium-debug
+++ b/BUILD/compile-pentium32-debug
diff --git a/BUILD/compile-pentium-debug-max b/BUILD/compile-pentium32-debug-max
index 2938aaaaa96..2938aaaaa96 100755
--- a/BUILD/compile-pentium-debug-max
+++ b/BUILD/compile-pentium32-debug-max
diff --git a/BUILD/compile-pentium-debug-openssl b/BUILD/compile-pentium32-debug-openssl
index 469495b1011..469495b1011 100755
--- a/BUILD/compile-pentium-debug-openssl
+++ b/BUILD/compile-pentium32-debug-openssl
diff --git a/BUILD/compile-pentium-gcov b/BUILD/compile-pentium32-gcov
index 44b672b256c..44b672b256c 100755
--- a/BUILD/compile-pentium-gcov
+++ b/BUILD/compile-pentium32-gcov
diff --git a/BUILD/compile-pentium-gprof b/BUILD/compile-pentium32-gprof
index 878a358e10b..878a358e10b 100755
--- a/BUILD/compile-pentium-gprof
+++ b/BUILD/compile-pentium32-gprof
diff --git a/BUILD/compile-pentium-icc-valgrind-max b/BUILD/compile-pentium32-icc-valgrind-max
index 182028629ac..182028629ac 100755
--- a/BUILD/compile-pentium-icc-valgrind-max
+++ b/BUILD/compile-pentium32-icc-valgrind-max
diff --git a/BUILD/compile-pentium-max b/BUILD/compile-pentium32-max
index f2766ab03b3..f2766ab03b3 100755
--- a/BUILD/compile-pentium-max
+++ b/BUILD/compile-pentium32-max
diff --git a/BUILD/compile-pentium-valgrind-max b/BUILD/compile-pentium32-valgrind-max
index 6784d202030..6784d202030 100755
--- a/BUILD/compile-pentium-valgrind-max
+++ b/BUILD/compile-pentium32-valgrind-max
diff --git a/BUILD/compile-pentium-wsrep b/BUILD/compile-pentium32-wsrep
index b0b8e408370..b0b8e408370 100644..100755
--- a/BUILD/compile-pentium-wsrep
+++ b/BUILD/compile-pentium32-wsrep
diff --git a/BUILD/compile-pentium64-wsrep b/BUILD/compile-pentium64-wsrep
index 285cdaca3e5..285cdaca3e5 100644..100755
--- a/BUILD/compile-pentium64-wsrep
+++ b/BUILD/compile-pentium64-wsrep
diff --git a/BUILD/compile-solaris-x86-32 b/BUILD/compile-solaris-x86-32
deleted file mode 100755
index 29965524479..00000000000
--- a/BUILD/compile-solaris-x86-32
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-path=`dirname $0`
-. "$path/SETUP.sh"
-extra_flags="-D__sun -m32"
-extra_configs="$max_configs --with-libevent"
-
-LDFLAGS="-lmtmalloc -R/usr/sfw/lib"
-export LDFLAGS
-
-. "$path/FINISH.sh"
diff --git a/BUILD/compile-solaris-x86-32-debug b/BUILD/compile-solaris-x86-32-debug
deleted file mode 100755
index 9ce91495c1c..00000000000
--- a/BUILD/compile-solaris-x86-32-debug
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-path=`dirname $0`
-. "$path/SETUP.sh"
-extra_flags="-D__sun -m32 $debug_cflags"
-extra_configs="$max_configs --with-libevent $debug_configs"
-
-LDFLAGS="-lmtmalloc -R/usr/sfw/lib"
-export LDFLAGS
-
-. "$path/FINISH.sh"
diff --git a/BUILD/compile-solaris-x86-32-debug-forte b/BUILD/compile-solaris-x86-32-debug-forte
deleted file mode 100755
index 777360865a2..00000000000
--- a/BUILD/compile-solaris-x86-32-debug-forte
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/sh
-
-path=`dirname $0`
-. "$path/SETUP.sh"
-
-# Take only #define options - the others are gcc specific.
-# (real fix is for SETUP.sh not to put gcc specific options in $debug_cflags)
-DEFS=""
-for F in $debug_cflags ; do
-        expr "$F" : "^-D" && DEFS="$DEFS $F"
-done
-debug_cflags="-O0 -g $DEFS"
-
-extra_flags="-m32 -mt -D_FORTEC_ -xbuiltin=%all -xlibmil -xlibmopt -fns=no -xprefetch=auto -xprefetch_level=3 $debug_cflags"
-extra_configs="$max_configs --with-libevent $debug_configs"
-
-warnings=""
-c_warnings=""
-cxx_warnings=""
-base_cxxflags="-noex"
-
-CC=cc
-CFLAGS="-xstrconst"
-CXX=CC
-LDFLAGS="-lmtmalloc"
-
-. "$path/FINISH.sh"
diff --git a/BUILD/compile-solaris-x86-forte-32 b/BUILD/compile-solaris-x86-forte-32
deleted file mode 100755
index 5aac376a44c..00000000000
--- a/BUILD/compile-solaris-x86-forte-32
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-
-path=`dirname $0`
-. "$path/SETUP.sh"
-
-extra_flags="-m32 -mt -D_FORTEC_ -xbuiltin=%all -xlibmil -xlibmopt -fns=no -xprefetch=auto -xprefetch_level=3"
-extra_configs="$max_configs --with-libevent"
-
-warnings=""
-c_warnings=""
-cxx_warnings=""
-base_cxxflags="-noex"
-
-CC=cc
-CFLAGS="-xstrconst"
-CXX=CC
-LDFLAGS="-lmtmalloc"
-
-. "$path/FINISH.sh"