diff options
| author | unknown <monty@donna.mysql.com> | 2000-10-20 17:39:23 +0300 |
|---|---|---|
| committer | unknown <monty@donna.mysql.com> | 2000-10-20 17:39:23 +0300 |
| commit | 982260d2cb5ec6b3864a34a4cb355160986f807f (patch) | |
| tree | c1fdd2f498afdf46ca3d76edce587eb117986b03 /scripts | |
| parent | ae687f81506b4021fe6f0b6743d749be1bf43456 (diff) | |
| download | mariadb-git-982260d2cb5ec6b3864a34a4cb355160986f807f.tar.gz | |
Bug fixes + defines for INNOBASE
Docs/manual.texi:
Cleanups
client/sql_string.cc:
Fixes for AIX
mit-pthreads/Changes-mysql:
Changelog
mit-pthreads/config/configure.in:
Fixes for NETBSD
mit-pthreads/config/configure:
Fixes for NETBSD
mit-pthreads/gen/ctime.c:
Fixes for NETBSD
mysys/my_pthread.c:
Changed assert to dbug_assert
scripts/make_binary_distribution.sh:
Removed mysql-test
scripts/safe_mysqld.sh:
Forced --defaults-extra-file to be first argument to mysqld
sql/handler.h:
Added INNOBASE database type
sql/item_func.h:
Fixed core dump when using MATCH
sql/lex.h:
Added INNOBASE database type
sql/mysqld.cc:
Fix for future
sql/sql_yacc.yy:
Added INNOBASE database type
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/make_binary_distribution.sh | 4 | ||||
| -rw-r--r-- | scripts/safe_mysqld.sh | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/scripts/make_binary_distribution.sh b/scripts/make_binary_distribution.sh index 3dd4a4a6acd..7fc492439d0 100644 --- a/scripts/make_binary_distribution.sh +++ b/scripts/make_binary_distribution.sh @@ -37,8 +37,8 @@ done for i in extra/comp_err extra/replace extra/perror extra/resolveip \ extra/my_print_defaults isam/isamchk isam/pack_isam myisam/myisamchk myisam/myisampack sql/mysqld sql/mysqlbinlog \ - client/mysql sql/mysqld client/mysqlshow client/mysqladmin client/mysqldump client/mysqlimport client/mysql-test \ - client/.libs/mysql client/.libs/mysqlshow client/.libs/mysqladmin client/.libs/mysqldump client/.libs/mysqlimport client/.libs/mysql-test + client/mysql sql/mysqld client/mysqlshow client/mysqladmin client/mysqldump client/mysqlimport \ + client/.libs/mysql client/.libs/mysqlshow client/.libs/mysqladmin client/.libs/mysqldump client/.libs/mysqlimport do cp -p $i $BASE/bin done diff --git a/scripts/safe_mysqld.sh b/scripts/safe_mysqld.sh index ee9f40ed5dd..43023e0fb8b 100644 --- a/scripts/safe_mysqld.sh +++ b/scripts/safe_mysqld.sh @@ -14,7 +14,7 @@ trap '' 1 2 3 15 # we shouldn't let anyone kill us defaults= case "$1" in - --no-defaults|--defaults-file=*) + --no-defaults|--defaults-file=*|--defaults-extra-file=*) defaults="$1"; shift ;; esac @@ -138,8 +138,8 @@ fi # checked and repaired at start # # echo "Checking tables in $DATADIR" -# $MY_BASEDIR_VERSION/bin/myisamchk --silent --force --fast --medium-check $DATADIR/*/*.MYI -# $MY_BASEDIR_VERSION/bin/isamchk --silent --force $DATADIR/*/*.ISM +# $MY_BASEDIR_VERSION/bin/myisamchk --silent --force --fast --medium-check -O key_buffer=64M -O sort_buffer=64M $DATADIR/*/*.MYI +# $MY_BASEDIR_VERSION/bin/isamchk --silent --force -O sort_buffer=64M $DATADIR/*/*.ISM echo "Starting mysqld daemon with databases from $DATADIR" @@ -155,9 +155,9 @@ do rm -f $MYSQL_UNIX_PORT $pid_file # Some extra safety if test "$#" -eq 0 then - (trap "" 1 ; exec $NOHUP_NICENESS $ledir/mysqld --basedir=$MY_BASEDIR_VERSION --datadir=$DATADIR --user=$user --pid-file=$pid_file @MYSQLD_DEFAULT_SWITCHES@ >> $err_log 2>&1 ) + (trap "" 1 ; exec $NOHUP_NICENESS $ledir/mysqld $defaults --basedir=$MY_BASEDIR_VERSION --datadir=$DATADIR --user=$user --pid-file=$pid_file @MYSQLD_DEFAULT_SWITCHES@ >> $err_log 2>&1 ) else - (trap "" ; exec $NOHUP_NICENESS $ledir/mysqld --basedir=$MY_BASEDIR_VERSION --datadir=$DATADIR --user=$user --pid-file=$pid_file @MYSQLD_DEFAULT_SWITCHES@ "$@" >> $err_log 2>&1 ) + (trap "" ; exec $NOHUP_NICENESS $ledir/mysqld $defaults --basedir=$MY_BASEDIR_VERSION --datadir=$DATADIR --user=$user --pid-file=$pid_file @MYSQLD_DEFAULT_SWITCHES@ "$@" >> $err_log 2>&1 ) fi if test ! -f $pid_file # This is removed if normal shutdown then |