bk commit into 5.1 tree (stewart:1.2264) BUG#20294

[Stewart Smith]

Below is the list of changes that have just been committed into a local
5.1 repository of stewart. When stewart 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-07-24 09:38:42+10:00, stewart@willster.(none) +1 -0
  BUG#20294 Instance manager test im_instance_conf fails randomly
  
  (well, im_options in this case, but using existing bug report)

  mysql-test/t/disabled.def@stripped, 2006-07-24 09:38:38+10:00, stewart@willster.(none) +1 -1
    disable im_options test as it's non-deterministic. reopen bug

# 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:	stewart
# Host:	willster.(none)
# Root:	/home/stewart/Documents/MySQL/5.1/main

--- 1.175/mysql-test/t/disabled.def	2006-07-24 09:38:47 +10:00
+++ 1.176/mysql-test/t/disabled.def	2006-07-24 09:38:47 +10:00
@@ -14,7 +14,7 @@
 #events                   : BUG#17619 2006-02-21 andrey  Race conditions
 #events_scheduling        : BUG#19170 2006-04-26 andrey  Test case of 19170 fails on some platforms. Has to be checked.
 #im_instance_conf          : Bug#20294 2006-06-06 monty   Instance manager test im_instance_conf fails randomly
-#im_options                : Bug#20294 2006-06-06 monty   Instance manager test im_instance_conf fails randomly
+im_options                : Bug#20294 2006-07-24 stewart   Instance manager test im_instance_conf fails randomly
 #im_life_cycle             : Bug#20368 2006-06-10 alik    im_life_cycle test fails
 ndb_autodiscover         : BUG#18952 2006-02-16 jmiller Needs to be fixed w.r.t binlog
 ndb_autodiscover2        : BUG#18952 2006-02-16 jmiller Needs to be fixed w.r.t binlog