summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorunknown <monty@donna.mysql.fi>2001-04-13 22:09:33 +0300
committerunknown <monty@donna.mysql.fi>2001-04-13 22:09:33 +0300
commit6efc95d5a0145eabcc389f2bce922cc1f89da35b (patch)
tree334db2402b4aee273ded1ee0710570238dbc373a /scripts
parent00b254969dd99527dc1897f354e4f55490980670 (diff)
downloadmariadb-git-6efc95d5a0145eabcc389f2bce922cc1f89da35b.tar.gz
Changed -O6 to -O3
Portability fix for Innodb BUILD/compile-pentium-max: Change mode to -rwxrwxr-x BUILD/SETUP.sh: Changed -O6 to -O3 Docs/manual.texi: Changed -O6 to -O3 configure.in: Changed -O6 to -O3 Added test of pthread_yield (For Innodb) innobase/os/os0thread.c: Fix portability problem with RedHat 6.1 scripts/safe_mysqld.sh: Fix option --mysqld-version sql/gen_lex_hash.cc: Smaller array support-files/mysql.spec.sh: Changed -O6 to -O3
Diffstat (limited to 'scripts')
-rw-r--r--scripts/safe_mysqld.sh12
1 files changed, 10 insertions, 2 deletions
diff --git a/scripts/safe_mysqld.sh b/scripts/safe_mysqld.sh
index cc06d20668f..6c006e96768 100644
--- a/scripts/safe_mysqld.sh
+++ b/scripts/safe_mysqld.sh
@@ -52,7 +52,15 @@ parse_arguments() {
--core-file-size=*) core_file_size=`echo "$arg" | sed -e "s;--core_file_size=;;"` ;;
--timezone=*) TZ=`echo "$arg" | sed -e "s;--timezone=;;"` ; export TZ; ;;
--mysqld=*) MYSQLD=`echo "$arg" | sed -e "s;--mysqld=;;"` ;;
- --mysqld-version=*) MYSQLD=mysqld-`echo "$arg" | sed -e "s;--mysqld-version=;;"` ;;
+ --mysqld-version=*)
+ tmp=`echo "$arg" | sed -e "s;--mysqld-version=;;"`
+ if test -n "$tmp"
+ then
+ MYSQLD="mysqld-$tmp"
+ else
+ MYSQLD="mysqld"
+ fi
+ ;;
*)
if test -n "$pick_args"
then
@@ -73,7 +81,7 @@ then
MY_BASEDIR_VERSION=$MY_PWD # Where bin, share and data are
ledir=$MY_BASEDIR_VERSION/bin # Where mysqld is
DATADIR=$MY_BASEDIR_VERSION/data
- if test -z "defaults"
+ if test -z "$defaults"
then
defaults="--defaults-extra-file=$MY_BASEDIR_VERSION/data/my.cnf"
fi