diff options
| author | unknown <df@pippilotta.erinye.com> | 2007-04-11 14:06:03 +0200 |
|---|---|---|
| committer | unknown <df@pippilotta.erinye.com> | 2007-04-11 14:06:03 +0200 |
| commit | 6b69068d6d37b471697aad662f875f796a955c1d (patch) | |
| tree | 0c0d0efc89a12e72b5cedb1d95a0afc3f863c9ba | |
| parent | e4668eebf24d77c4c349cc73d57d5bda00982c0f (diff) | |
| parent | 9cc4031808d8338b3c08d7d6cc947bb181f3fe55 (diff) | |
| download | mariadb-git-6b69068d6d37b471697aad662f875f796a955c1d.tar.gz | |
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-27701
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work-27701
BUILD/compile-pentium-debug:
Auto merged
BUILD/compile-pentium-debug-max-no-ndb:
Auto merged
BUILD/compile-pentium64-debug-max:
Auto merged
BUILD/compile-pentium64-debug:
Auto merged
BUILD/compile-pentium-debug-max:
merge fix
| -rwxr-xr-x | BUILD/compile-pentium-debug | 3 | ||||
| -rwxr-xr-x | BUILD/compile-pentium-debug-max | 3 | ||||
| -rwxr-xr-x | BUILD/compile-pentium-debug-max-no-ndb | 3 | ||||
| -rwxr-xr-x | BUILD/compile-pentium64-debug | 3 | ||||
| -rwxr-xr-x | BUILD/compile-pentium64-debug-max | 3 |
5 files changed, 10 insertions, 5 deletions
diff --git a/BUILD/compile-pentium-debug b/BUILD/compile-pentium-debug index db2bbea02f4..3f4027c5dd6 100755 --- a/BUILD/compile-pentium-debug +++ b/BUILD/compile-pentium-debug @@ -1,7 +1,8 @@ #! /bin/sh path=`dirname $0` -. "$path/SETUP.sh" $@ --with-debug=full +set -- "$@" --with-debug=full +. "$path/SETUP.sh" extra_flags="$pentium_cflags $debug_cflags" extra_configs="$pentium_configs $debug_configs" diff --git a/BUILD/compile-pentium-debug-max b/BUILD/compile-pentium-debug-max index b2c8b4d9331..941a63a209f 100755 --- a/BUILD/compile-pentium-debug-max +++ b/BUILD/compile-pentium-debug-max @@ -1,7 +1,8 @@ #! /bin/sh path=`dirname $0` -. "$path/SETUP.sh" "$@" --with-debug=full +set -- "$@" --with-debug=full +. "$path/SETUP.sh" extra_flags="$pentium_cflags $debug_cflags" extra_configs="$pentium_configs $debug_configs $max_configs $error_inject --with-experimental-collations" diff --git a/BUILD/compile-pentium-debug-max-no-ndb b/BUILD/compile-pentium-debug-max-no-ndb index 3a94e89439a..3f7a7904050 100755 --- a/BUILD/compile-pentium-debug-max-no-ndb +++ b/BUILD/compile-pentium-debug-max-no-ndb @@ -1,7 +1,8 @@ #! /bin/sh path=`dirname $0` -. "$path/SETUP.sh" $@ --with-debug=full +set -- "$@" --with-debug=full +. "$path/SETUP.sh" extra_flags="$pentium_cflags $debug_cflags" extra_configs="$pentium_configs $debug_configs $max_no_ndb_configs" diff --git a/BUILD/compile-pentium64-debug b/BUILD/compile-pentium64-debug index 145d5c44f82..06ee672789c 100755 --- a/BUILD/compile-pentium64-debug +++ b/BUILD/compile-pentium64-debug @@ -1,7 +1,8 @@ #! /bin/sh path=`dirname $0` -. "$path/SETUP.sh" $@ --with-debug=full +set -- "$@" --with-debug=full +. "$path/SETUP.sh" extra_flags="$pentium64_cflags $debug_cflags" extra_configs="$pentium_configs $debug_configs $static_link" diff --git a/BUILD/compile-pentium64-debug-max b/BUILD/compile-pentium64-debug-max index 7b71237cb2f..b8b271688be 100755 --- a/BUILD/compile-pentium64-debug-max +++ b/BUILD/compile-pentium64-debug-max @@ -1,7 +1,8 @@ #! /bin/sh path=`dirname $0` -. "$path/SETUP.sh" $@ --with-debug=full +set -- "$@" --with-debug=full +. "$path/SETUP.sh" extra_flags="$pentium64_cflags $debug_cflags" extra_configs="$pentium_configs $debug_configs $max_configs" |