Commit 6e3695aa authored by Joerg Bruehe's avatar Joerg Bruehe
Browse files

Merge main 5.1 -> 5.1-build 

Merge conflict in the tests "<engine>_storedproc": These tests are deleted.
parents d2583006 b532dbea

BUILD/compile-solaris-amd64-forte

100644 → 100755
+4 −3
Original line number Diff line number Diff line
@@ -7,22 +7,23 @@ 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

# To compile 64 bit, add -m64 to EXTRA_64_BIT



EXTRA_64_BIT="-xarch=amd64"

EXTRA_64_BIT="-m64"

EXTRA="-fast"



#

# The following should not need to be touched

#



export CC CXX CFLAGS CXXFLAGS

export CC CXX CFLAGS CXXFLAGS LIBS

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"

LIBS=-lmtmalloc

./configure \

    --prefix=/usr/local/mysql \

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

BUILD/compile-solaris-amd64-forte-debug

+2 −2
Original line number Diff line number Diff line
@@ -6,8 +6,8 @@ gmake -k clean || true 
path=`dirname $0`

. "$path/autorun.sh"



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

EXTRA_64_BIT="-xarch=amd64"

# To compile 64 bit, add -m64 to EXTRA_64_BIT

EXTRA_64_BIT="-m64"



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

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

BUILD/compile-solaris-sparc

+1 −1
Original line number Diff line number Diff line
@@ -9,6 +9,6 @@ PATH=$PATH:/usr/ccs/bin:/usr/local/bin 
path=`dirname $0`

. "$path/autorun.sh"



CFLAGS="-g -Wimplicit -Wreturn-type -Wswitch -Wtrigraphs -Wcomment -W -Wchar-subscripts -Wformat -Wparentheses -Wsign-compare -Wwrite-strings -Wunused  -O3 -fno-omit-frame-pointer -mcpu=v8 -Wa,-xarch=v8plusa" CXX=gcc CXXFLAGS="-Wimplicit -Wreturn-type -Wswitch -Wtrigraphs -Wcomment -W -Wchar-subscripts -Wformat -Wparentheses -Wsign-compare -Wwrite-strings -Woverloaded-virtual -Wsign-promo -Wreorder -Wctor-dtor-privacy -Wnon-virtual-dtor -felide-constructors -fno-exceptions -fno-rtti  -O3 -fno-omit-frame-pointer -mcpu=v8 -Wa,-xarch=v8plusa -g" ./configure --prefix=/usr/local/mysql --enable-assembler --with-extra-charsets=complex --enable-thread-safe-client

CFLAGS="-g -Wimplicit -Wreturn-type -Wswitch -Wtrigraphs -Wcomment -W -Wchar-subscripts -Wformat -Wparentheses -Wsign-compare -Wwrite-strings -Wunused  -O3 -fno-omit-frame-pointer -mcpu=v8 -Wa,-xarch=v8plusa" CXX=gcc CXXFLAGS="-Wimplicit -Wreturn-type -Wswitch -Wtrigraphs -Wcomment -W -Wchar-subscripts -Wformat -Wparentheses -Wsign-compare -Wwrite-strings -Woverloaded-virtual -Wsign-promo -Wreorder -Wctor-dtor-privacy -Wnon-virtual-dtor -felide-constructors -fno-exceptions -fno-rtti  -O3 -fno-omit-frame-pointer -mcpu=v8 -Wa,-xarch=v8plusa -g" LIBS="-lmtmalloc" ./configure --prefix=/usr/local/mysql --enable-assembler --with-extra-charsets=complex --enable-thread-safe-client



make -j 4

BUILD/compile-solaris-sparc-forte

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ EXTRA="-fast" # Remove comment to target current machine 


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

CC=cc-5.0 CFLAGS="-Xa -xstrconst $STD" \

CXX=CC CXXFLAGS="-noex $STD" \

CXX=CC CXXFLAGS="-noex $STD" LIBS="-lmtmalloc" \

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



make -j 4

client/mysqldump.c

+8 −1
Original line number Diff line number Diff line
@@ -2396,8 +2396,15 @@ static uint get_table_structure(char *table, char *db, char *table_type, 
            fprintf(sql_file, ",\n  %s %s",

                    quote_name(row[0], name_buff, 0), row[1]);

          }



          /*

            Stand-in tables are always MyISAM tables as the default

            engine might have a column-limit that's lower than the

            number of columns in the view, and MyISAM support is

            guaranteed to be in the server anyway.

          */

          fprintf(sql_file,

                  "\n) */;\n"

                  "\n) ENGINE=MyISAM */;\n"

                  "SET character_set_client = @saved_cs_client;\n");



          check_io(sql_file);