Commit 443c4034 authored by unknown's avatar unknown
Browse files

Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.0 

into  fedora.(none):/home/reggie/bk/mysql-5.0-new
parents e9af959e 77afc169

BUILD/SETUP.sh

+7 −3
Original line number Diff line number Diff line
@@ -44,17 +44,21 @@ set -e 
export AM_MAKEFLAGS

AM_MAKEFLAGS="-j 4"



# SSL library to use. Should be changed to --with-yassl

SSL_LIBRARY=--with-openssl



# If you are not using codefusion add "-Wpointer-arith" to WARNINGS

# The following warning flag will give too many warnings:

# -Wshadow -Wunused  -Winline (The later isn't usable in C++ as

# __attribute()__ doesn't work with gnu C++)



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

#debug_extra_warnings="-Wuninitialized"

c_warnings="$global_warnings -Wunused"

cxx_warnings="$global_warnings -Woverloaded-virtual -Wsign-promo -Wreorder -Wctor-dtor-privacy -Wnon-virtual-dtor"

base_max_configs="--with-innodb --with-berkeley-db --with-ndbcluster --with-archive-storage-engine --with-openssl --with-big-tables --with-blackhole-storage-engine --with-federated-storage-engine --with-csv-storage-engine"

base_max_no_ndb_configs="--with-innodb --with-berkeley-db --without-ndbcluster --with-archive-storage-engine --with-openssl --with-big-tables --with-blackhole-storage-engine --with-federated-storage-engine --with-csv-storage-engine"

max_leave_isam_configs="--with-innodb --with-berkeley-db --with-ndbcluster --with-archive-storage-engine --with-federated-storage-engine --with-blackhole-storage-engine --with-csv-storage-engine --with-openssl --with-embedded-server --with-big-tables"

base_max_configs="--with-innodb --with-berkeley-db --with-ndbcluster --with-archive-storage-engine --with-big-tables --with-blackhole-storage-engine --with-federated-storage-engine --with-csv-storage-engine $SSL_LIBRARY"

base_max_no_ndb_configs="--with-innodb --with-berkeley-db --without-ndbcluster --with-archive-storage-engine --with-big-tables --with-blackhole-storage-engine --with-federated-storage-engine --with-csv-storage-engine $SSL_LIBRARY"

max_leave_isam_configs="--with-innodb --with-berkeley-db --with-ndbcluster --with-archive-storage-engine --with-federated-storage-engine --with-blackhole-storage-engine --with-csv-storage-engine $SSL_LIBRARY --with-embedded-server --with-big-tables"

max_configs="$base_max_configs --with-embedded-server"

max_no_ndb_configs="$base_max_no_ndb_configs --with-embedded-server"

BUILD/compile-pentium64-debug-max

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



path=`dirname $0`

. "$path/SETUP.sh" $@ --with-debug=full



extra_flags="$pentium64_cflags $debug_cflags $max_cflags"

c_warnings="$c_warnings $debug_extra_warnings"

cxx_warnings="$cxx_warnings $debug_extra_warnings"

extra_configs="$pentium_configs $debug_configs $max_configs"



extra_configs="$extra_configs "



. "$path/FINISH.sh"

Makefile.am

+2 −2
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ test: 


test-force:

	cd mysql-test; \

	./mysql-test-run --force ; \

	./mysql-test-run --force && \

	./mysql-test-run --ps-protocol --force



# We are testing a new Perl version of the test script
@@ -123,7 +123,7 @@ test-pl: 


test-force-pl:

	cd mysql-test; \

	./mysql-test-run.pl --force ; \

	./mysql-test-run.pl --force && \

	./mysql-test-run.pl --ps-protocol --force



# Don't update the files from bitkeeper

NEW-RPMS/.cvsignore

deleted100644 → 0
+0 −1
Original line number Diff line number Diff line 
MySQL-*.rpm

client/mysql.cc

+5 −4
Original line number Diff line number Diff line
@@ -1133,10 +1133,11 @@ static COMMANDS *find_command(char *name,char cmd_char) 
      parsing the row and calling find_command()

    */

    if (strstr(name, "\\g") || (strstr(name, delimiter) &&

                                strlen(name) >= 9 &&

                                my_strnncoll(charset_info,(uchar*) name,

                                             9,

                                             (const uchar*) "delimiter", 9)))

                                !(strlen(name) >= 9 &&

                                  !my_strnncoll(charset_info,

                                                (uchar*) name, 9,

                                                (const uchar*) "delimiter",

                                                9))))

      DBUG_RETURN((COMMANDS *) 0);

    if ((end=strcont(name," \t")))

    {