bk commit into 5.0 tree (kent:1.1814)

[kent]

Below is the list of changes that have just been committed into a local
5.0 repository of kent. When kent does a push these changes will
be propagated 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://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1814 05/03/15 19:48:42 kent@stripped +2 -0
  mysql-test-run.sh:
    Added feature to disable tests from a list in a file "disabled.def"
    Moved down the code that disables, so that --do-test and --start-from
    don't list the disabled tests not in range.
  disabled.def:
    List of test cases to temporarely disable

  mysql-test/mysql-test-run.sh
    1.253 05/03/15 19:41:14 kent@stripped +14 -6
    Added feature to disable tests from a list in a file "disabled.def"
    Moved down the code that disables, so that --do-test and --start-from
    don't list the disabled tests not in range.

  mysql-test/t/disabled.def
    1.1 05/03/15 19:40:20 kent@stripped +20 -0
    List of test cases to temporarely disable

  mysql-test/t/disabled.def
    1.0 05/03/15 19:40:20 kent@stripped +0 -0
    BitKeeper file /Users/kent/mysql/bk/mysql-5.0-compile/mysql-test/t/disabled.def

# 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:	kent
# Host:	g4.boortz.dyndns.org
# Root:	/Users/kent/mysql/bk/mysql-5.0-compile

--- 1.252/mysql-test/mysql-test-run.sh	2005-03-13 12:19:22 +01:00
+++ 1.253/mysql-test/mysql-test-run.sh	2005-03-15 19:41:14 +01:00
@@ -1506,12 +1506,6 @@
  if [ -n "$RESULT_EXT" -a \( x$RECORD = x1 -o -f "$result_file$RESULT_EXT" \) ] ; then
    result_file="$result_file$RESULT_EXT"
  fi
- if [ -f "$TESTDIR/$tname.disabled" ]
- then
-   comment=`$CAT $TESTDIR/$tname.disabled`;
-   disable_test $tname "$comment"
-   return
- fi
  if [ "$USE_MANAGER" = 1 ] ; then
   many_slaves=`$EXPR \( \( $tname : rpl_failsafe \) != 0 \) \| \( \( $tname :
rpl_chain_temp_table \) != 0 \)`
  fi
@@ -1538,6 +1532,20 @@
 
  if [ x${NO_SLAVE}x$SKIP_SLAVE = x1x0 ] ; then
    skip_test $tname
+   return
+ fi
+
+ if [ -f "$TESTDIR/$tname.disabled" ]
+ then
+   comment=`$CAT $TESTDIR/$tname.disabled`;
+   disable_test $tname "$comment"
+   return
+ fi
+ comment=`$GREP "^$tname *: *" $TESTDIR/disabled.def`;
+ if [ -n "$comment" ]
+ then
+   comment=`echo $comment | sed 's/^[^:]*: *//'`
+   disable_test $tname "$comment"
    return
  fi
 
--- New file ---
+++ mysql-test/t/disabled.def	05/03/15 19:40:20
##############################################################################
#
#  List the test cases that are to be disabled temporarely.
#
#  Separate the test case name and the comment with ':'.
#
#      <testcasename>  : Comment test
#
#  Don't use any TAB characters for whitespace.
#
##############################################################################

ndb_alter_table   : NDB team needs to fix
ndb_autodiscover  : NDB team needs to fix
ndb_autodiscover2 : NDB team needs to fix
ndb_cache_multi   : NDB team needs to fix
ndb_cache_multi2  : NDB team needs to fix
ndb_multi         : NDB team needs to fix
ndb_restore       : NDB team needs to fix