List:Internals« Previous MessageNext Message »
From:serg Date:July 13 2001 11:58am
Subject:bk commit into 4.0 tree
View as plain text  
Below is the list of changes that have just been committed into a
4.0 repository of serg. When serg does a push, they will be propogated to 
the main repository and within 24 hours after the push to the public repository. 
For information on how to access the public repository
see http://www.mysql.com/doc/I/n/Installing_source_tree.html

ChangeSet@stripped, 2001-07-13 13:58:25+02:00, serg@stripped
  a trick for --client-gdb to work for both statically and dynamically linked client
  better exit code checking

  mysql-test/mysql-test-run.sh
    1.88 01/07/13 13:58:24 serg@stripped +10 -5
    a trick for --client-gdb to work for both statically and dynamically linked client
    better exit code checking

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	serg
# Host:	serg.mysql.com
# Root:	/usr/home/serg/Abk/mysql-4.0

--- 1.87/mysql-test/mysql-test-run.sh	Thu Jul 12 18:06:41 2001
+++ 1.88/mysql-test/mysql-test-run.sh	Fri Jul 13 13:58:24 2001
@@ -258,7 +258,12 @@
 # on binary, use what is installed
 if [ x$SOURCE_DIST = x1 ] ; then
  MYSQLD="$BASEDIR/sql/mysqld"
- MYSQL_TEST="$BASEDIR/client/.libs/lt-mysqltest" # for --client-gdb to work
+ if [ -e "$BASEDIR/client/.libs/mysqltest" ] ; then
+   [ -e "$BASEDIR/client/.libs/lt-mysqltest" ] || $BASEDIR/client/mysqltest -V
+   MYSQL_TEST="$BASEDIR/client/.libs/lt-mysqltest"
+ else
+   MYSQL_TEST="$BASEDIR/client/mysqltest"
+ fi
  MYSQLADMIN="$BASEDIR/client/mysqladmin"
  MYSQL="$BASEDIR/client/mysql"
  LANGUAGE="$BASEDIR/sql/share/english/"
@@ -788,7 +793,10 @@
       $ECHO "$RES$RES_SPACE [ pass ]"
     else
       # why the following ``if'' ? That is why res==1 is special ?
-      if [ $res = 1 ]; then
+      if [ $res = 2 ]; then
+        skip_inc
+	$ECHO "$RES$RES_SPACE [ skipped ]"
+      else
 	total_inc
         fail_inc
 	$ECHO "$RES$RES_SPACE [ fail ]"
@@ -812,9 +820,6 @@
 	fi
 	$ECHO "Resuming Tests"
 	$ECHO ""
-      else
-        skip_inc
-	$ECHO "$RES$RES_SPACE [ skipped ]"
       fi
     fi
   fi
Thread
bk commit into 4.0 treeserg13 Jul