Commit b897f84d authored by monty@donna.mysql.fi's avatar monty@donna.mysql.fi
Browse files

Changes to get mysqld-max to compile

parent 46839ed2

BUILD/SETUP.sh

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ pentium_cflags="-mpentiumpro" 
sparc_cflags=""



fast_cflags="-O6 -fno-omit-frame-pointer"

reckless_cflags="-O6 -fomit-frame-pointer"

reckless_cflags="-O6 -fomit-frame-pointer -ffixed-ebp"

debug_cflags="-DEXTRA_DEBUG -DFORCE_INIT_OF_VARS -DSAFEMALLOC -DSAFE_MUTEX -O2"



base_cxxflags="-felide-constructors -fno-exceptions -fno-rtti"

BUILD/compile-pentium

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
path=`dirname $0`

. "$path/SETUP.sh"



extra_flags="$pentium_cflags $fast_cflags"

extra_flags="$pentium_cflags $reckless_cflags"

extra_configs="$pentium_configs"

strip=yes

Build-tools/Do-all-build-steps

+2 −2
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ aclocal; autoheader; aclocal; automake; autoconf 
(cd bdb/dist && sh s_all)

(cd innobase && aclocal && autoheader && aclocal && automake && autoconf)



# A normal user starts here. We must use mit-threads, bdb and innobase.

# A normal user starts here. We must use mit-threads, bdb and innodb.

# Otherwise they do not end up in the distribution.

./configure \

 --with-unix-socket-path=/var/tmp/mysql.sock \
@@ -64,7 +64,7 @@ aclocal; autoheader; aclocal; automake; autoconf 
 --with-mit-threads=yes $EXTRA_CONFIG \

 --enable-thread-safe-client \

 --with-berkeley-db \

 --with-innobase

 --with-innodb



gmake -j 2

Docs/manual.texi

+8 −5
Original line number Diff line number Diff line
@@ -9255,7 +9255,7 @@ above can always mail them to the developer's mailing list at 
@email{internals@@lists.mysql.com}.















RPM distributions prior to @strong{MySQL} Version 3.22 are user-contributed.













Beginning with Version 3.22, some RPMs are generated by us at 













Beginning with Version 3.22, the RPMs are generated by us at 















@strong{MySQL AB}.





























If you want to compile a debug version of @strong{MySQL}, you should add










@@ -28322,8 +28322,9 @@ get bigger.













Running with @code{--log-bin} makes @strong{[MySQL} 1 % slower.





























@item













Compiling without frame pointers @code{-fomit-frame-pointer} with gcc makes













@strong{MySQL} 1% faster.













Compiling on Linux-x86 using gcc without frame pointers













@code{-fomit-frame-pointer} or @code{-fomit-frame-pointer -ffixed-ebp}













@code{mysqld} 1-4% faster.















@end itemize





























The @strong{MySQL}-Linux distribution provided by @strong{MySQL AB} used










@@ -48717,8 +48718,10 @@ setting the @code{DBI_TRACE} environment variable.













On some operating systems, the error log will contain a stack trace if















@code{mysqld} dies unexpectedly. You can use this to find out where (and















maybe why) @code{mysqld} died. @xref{Error log}.  To get a stack trace,













you should NOT compile @code{mysqld} with the













@code{-fomit-frame-pointer} option to gcc.













you should NOT compile @code{mysqld} with the @code{-fomit-frame-pointer}













option to gcc. On Linux-x86 you can use













@code{-fomit-frame-pointer -ffixed-ebp} to get both speed and a reasonable













accurate stack trace.















@xref{Compiling for debugging}.





























If the error file contains something like the following:

























scripts/safe_mysqld.sh



+9
−1






























Original line number
Diff line number
Diff line








@@ -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@



























# 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=