bk commit into 5.1 tree (kroki:1.2270)

[kroki]

Below is the list of changes that have just been committed into a local
5.1 repository of tomash. When tomash 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@stripped, 2006-08-10 14:01:12+04:00, kroki@stripped +1 -0
  Enable ps.test back (fix for it is pushed).

  mysql-test/t/disabled.def@stripped, 2006-08-10 14:01:09+04:00, kroki@stripped +0
-1
    Enable ps.test back (fix for it is pushed).

# 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:	kroki
# Host:	moonlight.intranet
# Root:	/home/tomash/src/mysql_ab/mysql-5.1-merge

--- 1.184/mysql-test/t/disabled.def	2006-08-10 14:01:21 +04:00
+++ 1.185/mysql-test/t/disabled.def	2006-08-10 14:01:21 +04:00
@@ -22,7 +22,6 @@ ndb_binlog_ignore_db     : BUG#21279 200
 ndb_load                 : BUG#17233 2006-05-04 tomas failed load data from infile causes
mysqld dbug_assert, binlog not flushed
 ndb_restore_compat       : BUG#21283 2006-07-26 ingo    Test fails randomly
 partition_03ndb          : BUG#16385 2006-03-24 mikael Partitions: crash when updating a
range partitioned NDB table
-ps                       : BUG#21524 2006-08-08 pgalbraith 'ps' test fails in
--ps-protocol test AMD64 bit
 ps_7ndb                  : BUG#18950 2006-02-16 jmiller create table like does not obtain
LOCK_open
 rpl_ndb_2innodb          : BUG#19227 2006-04-20 pekka pk delete apparently not replicated
 rpl_ndb_2myisam          : BUG#19227 Seems to pass currently