Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 (47477993) · Commits · Software / OSDI20 Artifacts / mariadb

.bzrignore

+1 −0

+3 −9

Original line number	Diff line number	Diff line
		#!/bin/sh

		if ! test -f sql/mysqld.cc
		if test ! -f sql/mysqld.cc
		then
		echo "You must run this script from the MySQL top-level directory"
		exit 1
		@@ -109,12 +109,6 @@ fi
		# (returns 0 if finds lines)
		if ccache -V > /dev/null 2>&1
		then
		if ! (echo "$CC" \| grep "ccache" > /dev/null)
		then
		CC="ccache $CC"
		fi
		if ! (echo "$CXX" \| grep "ccache" > /dev/null)
		then
		CXX="ccache $CXX"
		fi
		echo "$CC" \| grep "ccache" > /dev/null \|\| CC="ccache $CC"
		echo "$CXX" \| grep "ccache" > /dev/null \|\| CXX="ccache $CXX"
		fi

+179 −176

Original line number	Diff line number	Diff line
		@@ -3,8 +3,8 @@
		# Check cpu of current machine and find the
		# best compiler optimization flags for gcc
		#
		#

		check_cpu () {
		if test -r /proc/cpuinfo ; then
		# on Linux (and others?) we can get detailed CPU information out of /proc
		cpuinfo="cat /proc/cpuinfo"
		@@ -114,7 +114,7 @@ esac


		if test -z "$cpu_arg"; then
		echo "BUILD/check-cpu: Oops, could not find out what kind of cpu this machine is using."
		echo "BUILD/check-cpu: Oops, could not find out what kind of cpu this machine is using." >&2
		check_cpu_cflags=""
		return
		fi
		@@ -167,16 +167,17 @@ esac
		touch __test.c

		while [ "$cpu_arg" ] ; do
		echo -n testing $cpu_arg "... "
		# FIXME: echo -n isn't portable - see contortions autoconf goes through
		echo -n testing $cpu_arg "... " >&2

		# compile check
		check_cpu_cflags=`eval echo $check_cpu_args`
		if $cc -c $check_cpu_cflags __test.c 2>/dev/null; then
		echo ok
		echo ok >&2
		break;
		fi

		echo failed
		echo failed >&2
		check_cpu_cflags=""

		# if compile failed: check whether it supports a predecessor of this CPU
		@@ -202,4 +203,6 @@ while [ "$cpu_arg" ] ; do
		done

		rm __test.*
		}

		check_cpu

0 → 100755

+19 −0

Original line number	Diff line number	Diff line
		#! /bin/sh

		path=`dirname $0`
		. "$path/SETUP.sh"

		extra_configs="$max_configs --with-ndb-test --with-ndb-ccflags='-DERROR_INSERT'"
		if [ "$full_debug" ]
		then
		extra_flags="$debug_cflags"
		c_warnings="$c_warnings $debug_extra_warnings"
		cxx_warnings="$cxx_warnings $debug_extra_warnings"
		extra_configs="$debug_configs $extra_configs"
		else
		extra_flags="$fast_cflags"
		fi

		extra_flags="$extra_flags $max_cflags -g"

		. "$path/FINISH.sh"

+4 −0