bk commit into 5.1 tree (elliot:1.2353)

[Elliot Murphy]

Below is the list of changes that have just been committed into a local
5.1 repository of emurphy. When emurphy 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.2353 06/04/22 01:12:02 elliot@stripped +1 -0
  Post merge fix.

  mysql-test/t/rpl_view-slave.opt
    1.2 06/04/22 01:11:57 elliot@stripped +0 -4
    Post-merge fix

# 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:	elliot
# Host:	xan.(none)
# Root:	/home/emurphy/src/mysql/bk-clean/mysql-5.1-merge

--- 1.1/mysql-test/t/rpl_view-slave.opt	2006-04-12 05:50:06 -04:00
+++ 1.2/mysql-test/t/rpl_view-slave.opt	2006-04-22 01:11:57 -04:00
@@ -1,5 +1 @@
-#
-# BUG18715 create view with replicate*ignore-table
-# The option is needed to force slave executes tables_ok
-# which must return OK in conditions of this tests (no table foo is used)
 --replicate-ignore-table=test.foo