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

into mysql.com:/Users/kent/mysql/bk/mysql-4.1

Makefile.am

@@ -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

@@ -64,7 +64,11 @@
 #include <sys/wait.h>
 #endif
 #ifndef WEXITSTATUS
-# define WEXITSTATUS(stat_val) ((unsigned)(stat_val) >> 8)
+# 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

scripts/mysql_config.sh

@@ -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
@@ -120,13 +123,13 @@ usage () {
 Usage: $0 [OPTIONS]
 Options:
         --cflags         [$cflags]
-	--include	 [$include]
+        --include        [$include]
         --libs           [$libs]
         --libs_r         [$libs_r]
         --socket         [$socket]
         --port           [$port]
         --version        [$version]
-	--libmysqld-libs [$embedded_libs]
+        --libmysqld-libs [$embedded_libs]
 EOF
         exit 1
 }
@@ -136,13 +139,13 @@ if test $# -le 0; then usage; fi
 while test $# -gt 0; do
         case $1 in
         --cflags)  echo "$cflags" ;;
-	--include) echo "$include" ;;
+        --include) echo "$include" ;;
         --libs)    echo "$libs" ;;
         --libs_r)  echo "$libs_r" ;;
         --socket)  echo "$socket" ;;
         --port)    echo "$port" ;;
         --version) echo "$version" ;;
-	--embedded-libs | --embedded | --libmysqld-libs) echo "$embedded_libs" ;;
+        --embedded-libs | --embedded | --libmysqld-libs) echo "$embedded_libs" ;;
         *)         usage ;;
         esac