summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorunknown <monty@donna.mysql.fi>2001-04-13 16:21:38 +0300
committerunknown <monty@donna.mysql.fi>2001-04-13 16:21:38 +0300
commit3b78ab65bb8e340b328cac5bca3188f64396ed61 (patch)
treed5bf5dce34ab694fbf5f6372332cd9a4226fe04c /scripts
parent0948956b802845699f9868b1e2c6b61a74f36b8d (diff)
downloadmariadb-git-3b78ab65bb8e340b328cac5bca3188f64396ed61.tar.gz
Changes to get mysqld-max to compile
BUILD/SETUP.sh: Changed to use -ffixed-ebp with -fomit-frame-pointer BUILD/compile-pentium: Changed to use reckless flags as defaults as this appears to work good, even with stack-traces. Build-tools/Do-all-build-steps: Innobase -> Innodb Docs/manual.texi: Added information about -ffixed-ebp scripts/safe_mysqld.sh: Added option --mysqld-version Use mysqld-max binary as default if installed and --mysqld or --mysqld-version is not used support-files/mysql-max.spec.sh: Fixed bugs support-files/mysql.spec.sh: Added Max package tests/fork_big.pl: Added --user and --password
Diffstat (limited to 'scripts')
-rw-r--r--scripts/safe_mysqld.sh10
1 files changed, 9 insertions, 1 deletions
diff --git a/scripts/safe_mysqld.sh b/scripts/safe_mysqld.sh
index 6d215ec3d16..cc06d20668f 100644
--- a/scripts/safe_mysqld.sh
+++ b/scripts/safe_mysqld.sh
@@ -52,6 +52,7 @@ 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=;;"` ;;
*)
if test -n "$pick_args"
then
@@ -92,7 +93,14 @@ fi
MYSQL_UNIX_PORT=${MYSQL_UNIX_PORT:-@MYSQL_UNIX_ADDR@}
MYSQL_TCP_PORT=${MYSQL_TCP_PORT:-@MYSQL_TCP_PORT@}
user=@MYSQLD_USER@
-MYSQLD=mysqld
+
+# Use the mysqld-max binary by default if the user doesn't specify a binary
+if test -x $ledir/mysqld-max
+then
+ MYSQLD=mysqld-max
+else
+ MYSQLD=mysqld
+fi
# these rely on $DATADIR by default, so we'll set them later on
pid_file=