bk commit into 5.0 tree (jmiller:1.2012)

[Jonathan Miller]

Below is the list of changes that have just been committed into a local
5.0 repository of ndbdev. When ndbdev 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.2012 05/10/13 20:52:09 jmiller@stripped +1 -0
  rpl_row_flsh_tbls.result:
    Updated result file for row based version

  mysql-test/r/rpl_row_flsh_tbls.result
    1.4 05/10/13 20:51:52 jmiller@stripped +6 -0
    Updated result file for row based version

# 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:	jmiller
# Host:	ndb08.mysql.com
# Root:	/home/ndbdev/jmiller/mysql-5.0-wl1012

--- 1.3/mysql-test/r/rpl_row_flsh_tbls.result	2005-09-17 13:16:32 +02:00
+++ 1.4/mysql-test/r/rpl_row_flsh_tbls.result	2005-10-13 20:51:52 +02:00
@@ -24,3 +24,9 @@
 master-bin.000001	#	Query	1	#	use `test`; flush tables
 select * from t3;
 a
+stop slave;
+drop table t1;
+flush tables with read lock;
+start slave;
+stop slave;
+ERROR HY000: Can't execute the given command because you have active locked tables or an active transaction