merge with xtradb-5.5.15

fix test cases

1 files changed, 11 insertions, 10 deletions

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)