diff options
| author | unknown <monty@donna.mysql.com> | 2000-12-31 11:38:44 +0200 |
|---|---|---|
| committer | unknown <monty@donna.mysql.com> | 2000-12-31 11:38:44 +0200 |
| commit | 085ac18198f212d1fd34e0f327dca390c18476c1 (patch) | |
| tree | f0e63f2938983bf57301ef7e1bf1fd2fd2334fed /scripts | |
| parent | 53b6c99d04f3d3a4ff2c9b46d431d379bc5786e6 (diff) | |
| download | mariadb-git-085ac18198f212d1fd34e0f327dca390c18476c1.tar.gz | |
Fixed new bug in BDB tables
myisam/mi_info.c:
Fixed potential bug
scripts/safe_mysqld.sh:
Only set --user if running as root
sql/ha_berkeley.cc:
Fixed core dump bug in ALTER TABLE
sql/mysql_priv.h:
Fixed wrong define
sql/mysqld.cc:
Cleanup
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/safe_mysqld.sh | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/scripts/safe_mysqld.sh b/scripts/safe_mysqld.sh index 11d17f822ee..0265dcdeeb9 100644 --- a/scripts/safe_mysqld.sh +++ b/scripts/safe_mysqld.sh @@ -149,8 +149,10 @@ then fi fi +USER="" if test -w / then + USER_OPTION="--user=$user" # If we are root, change the err log to the right user. touch $err_log; chown $user $err_log if test -n "$open_files" @@ -211,9 +213,9 @@ do rm -f $MYSQL_UNIX_PORT $pid_file # Some extra safety if test -z "$args" then - $NOHUP_NICENESS $ledir/$MYSQLD $defaults --basedir=$MY_BASEDIR_VERSION --datadir=$DATADIR --user=$user --pid-file=$pid_file @MYSQLD_DEFAULT_SWITCHES@ >> $err_log 2>&1 + $NOHUP_NICENESS $ledir/$MYSQLD $defaults --basedir=$MY_BASEDIR_VERSION --datadir=$DATADIR $USER_OPTION --pid-file=$pid_file @MYSQLD_DEFAULT_SWITCHES@ >> $err_log 2>&1 else - eval "$NOHUP_NICENESS $ledir/$MYSQLD $defaults --basedir=$MY_BASEDIR_VERSION --datadir=$DATADIR --user=$user --pid-file=$pid_file @MYSQLD_DEFAULT_SWITCHES@ $args >> $err_log 2>&1" + eval "$NOHUP_NICENESS $ledir/$MYSQLD $defaults --basedir=$MY_BASEDIR_VERSION --datadir=$DATADIR $USER_OPTION --pid-file=$pid_file @MYSQLD_DEFAULT_SWITCHES@ $args >> $err_log 2>&1" fi if test ! -f $pid_file # This is removed if normal shutdown then |