bk commit into 5.1 tree (msvensson:1.1969) BUG#15483

[msvensson]

Below is the list of changes that have just been committed into a local
5.1 repository of msvensson. When msvensson 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.1969 05/12/20 12:57:51 msvensson@neptunus.(none) +1 -0
  Bug #15483  	mysqlslap client fails in mysqlslap test.

  mysql-test/t/disabled.def
    1.26 05/12/20 12:57:38 msvensson@neptunus.(none) +0 -1
    Enable mysqlslap, it works now when it's running in silent mode.

# 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:	msvensson
# Host:	neptunus.(none)
# Root:	/home/msvensson/mysql/bug15845/my51-bug15845

--- 1.25/mysql-test/t/disabled.def	2005-12-19 03:03:43 +01:00
+++ 1.26/mysql-test/t/disabled.def	2005-12-20 12:57:38 +01:00
@@ -17,6 +17,5 @@
 func_group      : Bug#15448
 func_math       : Bug#15448
 group_min_max   : Bug#15448 
-mysqlslap       : Bug#15483
 subselect       : Bug#15706
 type_time       : Bug#15805