diff options
| author | serg@serg.mysql.com <> | 2001-04-15 20:56:29 +0200 |
|---|---|---|
| committer | serg@serg.mysql.com <> | 2001-04-15 20:56:29 +0200 |
| commit | 4fbab1d681a8ebffa9a699a727910c322419a713 (patch) | |
| tree | a73e872906e1ecc8029f3c9fd4aa66200dee9851 /scripts/safe_mysqld.sh | |
| parent | b8c416ac65355104962587122e247200904dc107 (diff) | |
| parent | 5d86c27a2d4e5a4851720b27f8ef733b174cb778 (diff) | |
| download | mariadb-git-4fbab1d681a8ebffa9a699a727910c322419a713.tar.gz | |
Merge work:/home/bk/mysql-4.0
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
Diffstat (limited to 'scripts/safe_mysqld.sh')
| -rw-r--r-- | scripts/safe_mysqld.sh | 10 |
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= |