Commit 6c7ce435 authored by monty@bitch.mysql.fi's avatar monty@bitch.mysql.fi
Browse files

Merge hundin:/my/mysql into bitch.mysql.fi:/my/mysql

parents 0b9c9210 2eacfddd

BUILD/compile-solaris-sparc-fortre

0 → 100755
+19 −0
Original line number Diff line number Diff line 
#! /bin/sh



gmake -k clean || true

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

 

aclocal && autoheader && aclocal && automake && autoconf

(cd bdb/dist && sh s_all)

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

if [ -d gemini ]

then

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

fi



PATH=/opt/SUNWspro/bin/:$PATH

CC=cc CFLAGS="-Xa -fast -xO4 -native -xstrconst -mt -D_FORTREC_" \

CXX=CC CXXFLAGS="-noex -xO4 -mt"  \

./configure --prefix=/usr/local/mysql --enable-assembler --with-extra-charsets=complex --enable-thread-safe-client



gmake -j 4

BUILD/compile-solaris-sparc-purify

+6 −2
Original line number Diff line number Diff line
@@ -6,8 +6,12 @@ aclocal && autoheader && aclocal && automake && autoconf 
(cd bdb/dist && sh s_all)

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



CFLAGS="-Wimplicit -Wreturn-type -Wid-clash-51 -Wswitch -Wtrigraphs -Wcomment -W -Wchar-subscripts -Wformat -Wimplicit-function-dec -Wimplicit-int -Wparentheses -Wsign-compare -Wwrite-strings -Wunused  -DHAVE_purify -DEXTRA_DEBUG -O2" CXX=gcc CXXLD=g++ CXXFLAGS="-Wimplicit -Wreturn-type -Wid-clash-51 -Wswitch -Wtrigraphs -Wcomment -W -Wchar-subscripts -Wformat -Wimplicit-function-dec -Wimplicit-int -Wparentheses -Wsign-compare -Wwrite-strings -Woverloaded-virtual -Wextern-inline -Wsign-promo -Wreorder -Wctor-dtor-privacy -Wnon-virtual-dtor -felide-constructors -fno-exceptions -fno-rtti  -DHAVE_purify -DEXTRA_DEBUG -O2" ./configure --prefix=/usr/local/mysql --enable-assembler --with-extra-charsets=complex --enable-thread-safe-client --with-debug=full --with-berkeley-db --with-innodb

CFLAGS="-Wimplicit -Wreturn-type -Wid-clash-51 -Wswitch -Wtrigraphs -Wcomment -W -Wchar-subscripts -Wformat -Wimplicit-function-dec -Wimplicit-int -Wparentheses -Wsign-compare -Wwrite-strings -Wunused  -DHAVE_purify -DEXTRA_DEBUG -O2" CXX=gcc CXXLD=g++ CXXFLAGS="-Wimplicit -Wreturn-type -Wid-clash-51 -Wswitch -Wtrigraphs -Wcomment -W -Wchar-subscripts -Wformat -Wimplicit-function-dec -Wimplicit-int -Wparentheses -Wsign-compare -Wwrite-strings -Woverloaded-virtual -Wextern-inline -Wsign-promo -Wreorder -Wctor-dtor-privacy -Wnon-virtual-dtor -felide-constructors -fno-exceptions -fno-rtti  -DHAVE_purify -DEXTRA_DEBUG -O2" ./configure --prefix=/usr/local/mysql --enable-assembler --with-extra-charsets=complex --enable-thread-safe-client --with-berkeley-db --with-innodb



gmake -j 4



cd sql ; rm mysqld ; make CXXLD="purify -best-effort g++"  mysqld
 
cd sql ; rm mysqld ;

make CXXLD="purify -best-effort g++"  mysqld ; mv mysqld mysqld-purify

make CXXLD="quantify -best-effort g++"  mysqld ; mv mysqld mysqld-quantify

make CXXLD="purecov -best-effort g++"  mysqld ; mv mysqld mysqld-purecov

mysys/hash.c

+4 −1
Original line number Diff line number Diff line
@@ -180,7 +180,10 @@ uint calc_hashnr_caseup(const byte *key, uint len) 
#endif





inline uint rec_hashnr(HASH *hash,const byte *record)

#ifndef _FORTREC_

inline

#endif

uint rec_hashnr(HASH *hash,const byte *record)

{

  uint length;

  byte *key=hash_key(hash,record,&length,0);