merge with xtradb-5.5.15

fix test cases

3 files changed, 12 insertions, 35 deletions

diff --git a/BUILD/SETUP.sh b/BUILD/SETUP.sh
index e0d8dad060f..e5a8255c428 100755
--- a/BUILD/SETUP.sh
+++ b/BUILD/SETUP.sh
@@ -149,7 +149,7 @@ fi
 # Override -DFORCE_INIT_OF_VARS from debug_cflags. It enables the macro
 # LINT_INIT(), which is only useful for silencing spurious warnings
 # of static analysis tools. We want LINT_INIT() to be a no-op in Valgrind.
-valgrind_flags="-UFORCE_INIT_OF_VARS -DHAVE_purify "
+valgrind_flags="-UFORCE_INIT_OF_VARS -DHAVE_purify -DHAVE_valgrind "
 valgrind_flags="$valgrind_flags -DMYSQL_SERVER_SUFFIX=-valgrind-max"
 valgrind_configs="--with-valgrind"
 #
diff --git a/BUILD/compile-innodb b/BUILD/compile-innodb
index 82601f03ae9..988c862465d 100755
--- a/BUILD/compile-innodb
+++ b/BUILD/compile-innodb
@@ -1,24 +1,25 @@
-#! /bin/sh
+#!/bin/sh
+#
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
-# Copyright (c) 2006, 2009, Innobase Oy. 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., 59 Temple
 # Place, Suite 330, Boston, MA 02111-1307 USA
 #
 
-path=`dirname $0`
-. "$path/SETUP.sh"
+# we assume this script is in storage/innobase/
+
+MYSQL_ROOT="$(dirname ${0})/../.."
 
-extra_flags="$pentium_cflags $fast_cflags -g"
-extra_configs="$pentium_configs $static_link --with-plugins=innobase"
+cd ${MYSQL_ROOT}
 
-. "$path/FINISH.sh"
+cmake -DWITH_INNOBASE_STORAGE_ENGINE:BOOL=ON
+make -j$(nproc)
diff --git a/BUILD/compile-innodb-debug b/BUILD/compile-innodb-debug
deleted file mode 100755
index efb4abf88d5..00000000000
--- a/BUILD/compile-innodb-debug
+++ /dev/null
@@ -1,24 +0,0 @@
-#! /bin/sh
-#
-# Copyright (c) 2005, 2009, Innobase Oy. 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., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA
-#
-
-path=`dirname $0`
-. "$path/SETUP.sh" $@ --with-debug=full
-
-extra_flags="$pentium_cflags $debug_cflags"
-extra_configs="$pentium_configs $debug_configs --with-plugins=innobase"
-
-. "$path/FINISH.sh"