Commit 7cfdd600 authored by mkindahl@dl145h.mysql.com's avatar mkindahl@dl145h.mysql.com
Browse files

Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0 

into  dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl-merge
parents 1bf737a1 10b194d2

BUILD/compile-solaris-amd64

+9 −54
Original line number Diff line number Diff line 
#!/usr/bin/bash



function _find_mysql_root () (

    while [ "x$PWD" != "x/" ]; do

	# Check if some directories are present

	if [ -d BUILD -a -d sql -a -d mysys ]; then

	    echo "$PWD"

	    return 0

	fi

	cd ..

    done

    return 1

)



make -k clean || true

/bin/rm -f */.deps/*.P config.cache

 

#! /bin/sh

path=`dirname $0`

. "$path/autorun.sh"

 

warning_flags="-Wimplicit -Wreturn-type -Wswitch -Wtrigraphs -Wcomment -W -Wchar-subscripts -Wformat -Wparentheses -Wsign-compare -Wwrite-strings -Wunused"

compiler_flags="-g -O3 -fno-omit-frame-pointer"



export CC CXX CFLAGS CXXFLAGS LDFLAGS LIBS

CC="gcc"

CXX="gcc"

CFLAGS="$warning_flags $compiler_flags"

CXXFLAGS="" 

LDFLAGS="-O3 -g -static-libgcc"

LIBS=-lmtmalloc

root=$(_find_mysql_root)



$root/configure \

    --prefix=/usr/local/mysql \

    --localstatedir=/usr/local/mysql/data \

    --libexecdir=/usr/local/mysql/bin \

    --with-extra-charsets=complex \

    --enable-thread-safe-client \

    --enable-local-infile \

    --with-zlib-dir=bundled \

    --with-big-tables \

    --with-readline \

    --with-archive-storage-engine \

    --with-named-curses=-lcurses \

    --with-big-tables \

    --with-innodb \

    --with-berkeley-db \

    --with-example-storage-engine \

    --with-blackhole-storage-engine \

    --with-ndbcluster \

    --with-federated-storage-engine \

    --with-csv-storage-engine \

    --with-ssl \

    --with-embedded-server \

    --disable-shared
 
. "$path/SETUP.sh"

amd64_cflags="-m64 -mtune=athlon64"

extra_flags="$amd64_cflags $max_cflags"

c_warnings="$c_warnings"

cxx_warnings="$cxx_warnings"

extra_configs="$amd64_configs $debug_configs $max_configs --enable-thread-safe-client"



. "$path/FINISH.sh"

BUILD/compile-solaris-amd64-debug

0 → 100644
+10 −0
Original line number Diff line number Diff line 
#! /bin/sh

path=`dirname $0`

. "$path/SETUP.sh"

amd64_cflags="-m64 -mtune=athlon64"

extra_flags="$amd64_cflags $debug_cflags $max_cflags"

c_warnings="$c_warnings $debug_extra_warnings"

cxx_warnings="$cxx_warnings $debug_extra_warnings"

extra_configs="$amd64_configs $debug_configs $max_configs --enable-thread-safe-client"



. "$path/FINISH.sh"

BUILD/compile-solaris-amd64-forte

0 → 100644
+52 −0
Original line number Diff line number Diff line 
#! /bin/sh



gmake -k clean || true

/bin/rm -f */.deps/*.P config.cache

 

path=`dirname $0`

. "$path/autorun.sh"



# For "optimal" code for this computer add -fast to EXTRA

# To compile 64 bit, add -xarch=v9 to EXTRA_64_BIT



EXTRA_64_BIT="-xarch=amd64"

EXTRA="-fast"



#

# The following should not need to be touched

#



export CC CXX CFLAGS CXXFLAGS

STD="-g -mt -D_FORTEC_ $EXTRA $EXTRA_64_BIT"

ASFLAGS="$EXTRA_64_BIT"

CC=cc-5.0

CFLAGS="-Xa -xstrconst $STD"

CXX=CC

CXXFLAGS="-noex $STD"

./configure \

    --prefix=/usr/local/mysql \

    --localstatedir=/usr/local/mysql/data \

    --libexecdir=/usr/local/mysql/bin \

    --with-extra-charsets=complex \

    --enable-thread-safe-client \

    --enable-local-infile \

    --with-zlib-dir=bundled \

    --with-big-tables \

    --with-readline \

    --with-archive-storage-engine \

    --with-named-curses=-lcurses \

    --with-big-tables \

    --with-innodb \

    --with-example-storage-engine \

    --with-blackhole-storage-engine \

    --with-federated-storage-engine \

    --with-csv-storage-engine \

    --with-ssl \

    --enable-assembler



# Not including:

#     --with-ndbcluster

#     --with-berkeley-db



gmake -j4

test $? = 0 && make test

BUILD/compile-solaris-amd64-forte-debug

0 → 100644
+54 −0
Original line number Diff line number Diff line 
#! /bin/sh



gmake -k clean || true

/bin/rm -f */.deps/*.P config.cache

 

path=`dirname $0`

. "$path/autorun.sh"



# To compile 64 bit, add -xarch=amd64 to EXTRA_64_BIT

EXTRA_64_BIT="-xarch=amd64"



# For "optimal" code for this computer add -fast to EXTRA. Note that

# this causes problem with debugging the program since -fast implies

# -xO5.

EXTRA=""



#

# The following should not need to be touched

#



export CC CXX CFLAGS CXXFLAGS

STD="-g -mt -D_FORTEC_ $EXTRA $EXTRA_64_BIT $debug_cflags"

ASFLAGS="$EXTRA_64_BIT"

CC=cc-5.0

CFLAGS="-Xa -xstrconst $STD"

CXX=CC

CXXFLAGS="-noex $STD"

./configure \

    --prefix=/usr/local/mysql \

    --localstatedir=/usr/local/mysql/data \

    --libexecdir=/usr/local/mysql/bin \

    --with-extra-charsets=complex \

    --enable-thread-safe-client \

    --enable-local-infile \

    --with-zlib-dir=bundled \

    --with-big-tables \

    --with-readline \

    --with-archive-storage-engine \

    --with-named-curses=-lcurses \

    --with-big-tables \

    --with-innodb \

    --with-example-storage-engine \

    --with-blackhole-storage-engine \

    --with-federated-storage-engine \

    --with-csv-storage-engine \

    --with-ssl \

    --with-debug \

    --enable-assembler



# Not including:

#     --with-ndbcluster

#     --with-berkeley-db



gmake -j4

include/my_sys.h

+6 −0
Original line number Diff line number Diff line
@@ -530,6 +530,12 @@ typedef int (*qsort2_cmp)(const void *, const void *, const void *); 
#define my_b_tell(info) ((info)->pos_in_file + \

			 (uint) (*(info)->current_pos - (info)->request_pos))



#define my_b_get_buffer_start(info) (info)->request_pos 

#define my_b_get_bytes_in_buffer(info) (char*) (info)->read_end -   \

  (char*) my_b_get_buffer_start(info)

#define my_b_get_pos_in_file(info) (info)->pos_in_file





/* tell write offset in the SEQ_APPEND cache */

my_off_t my_b_append_tell(IO_CACHE* info);

my_off_t my_b_safe_tell(IO_CACHE* info); /* picks the correct tell() */