Commit b337566b authored by unknown's avatar unknown
Browse files

Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 

into mysql.com:/Users/kent/mysql/bk/mysql-4.1
parents a51f7832 3614cff7

Makefile.am

+13 −2
Original line number Diff line number Diff line
@@ -106,12 +106,12 @@ MYSQL_TEST_NDB_PORT = 9350 


test:

	cd mysql-test ; \

	./mysql-test-run.pl \

	./mysql-test-run \

		--manager-port=$(MYSQL_TEST_MANAGER_PORT) \

		--master_port=$(MYSQL_TEST_MASTER_PORT) \

		--slave_port=$(MYSQL_TEST_SLAVE_PORT) \

		--ndbcluster_port=$(MYSQL_TEST_NDB_PORT) && \

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

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

		--manager-port=$(MYSQL_TEST_MANAGER_PORT) \

		--master_port=$(MYSQL_TEST_MASTER_PORT) \

		--slave_port=$(MYSQL_TEST_SLAVE_PORT) \
@@ -121,3 +121,14 @@ test-force: 
	cd mysql-test; \

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

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



# We are testing a new Perl version of the test script

test-pl:

	cd mysql-test; \

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

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



test-force-pl:

	cd mysql-test; \

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

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

client/mysqltest.c

+5 −1
Original line number Diff line number Diff line
@@ -64,8 +64,12 @@ 
#include <sys/wait.h>

#endif

#ifndef WEXITSTATUS

# ifdef __WIN__

#  define WEXITSTATUS(stat_val) (stat_val)

# else

#  define WEXITSTATUS(stat_val) ((unsigned)(stat_val) >> 8)

# endif

#endif

#define MAX_QUERY     131072

#define MAX_VAR_NAME	256

#define MAX_COLUMNS	256

scripts/mysql_config.sh

+8 −5
Original line number Diff line number Diff line
@@ -105,9 +105,12 @@ embedded_libs="$ldflags -L$pkglibdir -lmysqld @LIBS@ @WRAPLIBS@ @innodb_system_l 
embedded_libs=`echo "$embedded_libs" | sed -e 's;  \+; ;g' | sed -e 's;^ *;;' | sed -e 's; *\$;;'`



# Remove some options that a client doesn't have to care about

# FIXME until we have a --cxxflags, we need to remove -Xa

#       and -xstrconst to make --cflags usable for Sun Forte C++

for remove in DDBUG_OFF DSAFEMALLOC USAFEMALLOC DSAFE_MUTEX \

              DPEDANTIC_SAFEMALLOC DUNIV_MUST_NOT_INLINE DFORCE_INIT_OF_VARS \

              DEXTRA_DEBUG DHAVE_purify 'O[0-9]' 'W[-A-Za-z]*'

              DEXTRA_DEBUG DHAVE_purify 'O[0-9]' 'W[-A-Za-z]*' \

              Xa xstrconst

do

  # The first option we might strip will always have a space before it because

  # we set -I$pkgincludedir as the first option