From: Dmitry Lenev
Date: November 12 2010 1:57pm
Subject: bzr commit into mysql-5.5-runtime branch (Dmitry.Lenev:3182) Bug#54673
 Bug#57006
List-Archive: http://lists.mysql.com/commits/123730
X-Bug: 54673,57006
Message-Id: <20101112135727.99436E58D3@mockturtle>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0201354860=="

--===============0201354860==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#At file:///home/dlenev/src/bzr/mysql-5.5-runtime/ based on revid:kostja@stripped

 3182 Dmitry Lenev	2010-11-12
      Follow-up for patch fixing bug #57006 "Deadlock between
      HANDLER and FLUSH TABLES WITH READ LOCK" and bug #54673
      "It takes too long to get readlock for 'FLUSH TABLES
      WITH READ LOCK'".
      
      Disable execution of flush_read_lock.test on embedded
      server. This test uses too many statements which are
      not supported by embedded server.

    modified:
      mysql-test/t/flush_read_lock.test
=== modified file 'mysql-test/t/flush_read_lock.test'
--- a/mysql-test/t/flush_read_lock.test	2010-11-11 17:11:05 +0000
+++ b/mysql-test/t/flush_read_lock.test	2010-11-12 13:57:08 +0000
@@ -7,6 +7,9 @@
 --source include/have_innodb.inc
 # We need the Debug Sync Facility.
 --source include/have_debug_sync.inc
+# Parts of this test use DDL on events, BINLOG statement and
+# other statements which are not supported in embedded server.
+-- source include/not_embedded.inc
 # Save the initial number of concurrent sessions.
 --source include/count_sessions.inc
 


--===============0201354860==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/dmitry.lenev@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: dmitry.lenev@stripped
# target_branch: file:///home/dlenev/src/bzr/mysql-5.5-runtime/
# testament_sha1: 9398803bc0581b37c3531881df3d90cca1dc1def
# timestamp: 2010-11-12 16:57:27 +0300
# base_revision_id: kostja@stripped
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWRzmziAAAZXfgGAQWOf/93/t
3oC////wUARG0Kru90ztr3V7WYSpohE8mEYTSekabRNDTTRppptIYmTTTIJRIjTxAA1QBoZPUANA
AAABJTIJomQFPCaamTQMnlABp6mgDTQDElNkE9KbUZqabSDNT1BoAAAAAEok0BMKeSeUeo9TamTR
iZqDagADQBAaEfmoM+ziONpMe9dg1auwbcywOihbfUxlV59vUb4J47yCJD9HBpyGlt5pG1cb8UOQ
5X8wUXIqpNpuenSYsJAOU1uCT6LCjFrV7r+ObdSEWKm/rxTmqlDHlciQPDx3Rfl8sOHsIuPCIRRg
1TgfXivJT6EPpkS88NhkHliUsEvgWyRybcSglO6KW4M83ndCIsVzdRv9t+8FRCpLtf1jEYijwH9K
dPHmUo6xUTLbDBDXLVQFhP0VNLOsRBTBQQRla6CqsmduezjMWMkn6rtBPZwnU24FtuXLi8agT0At
KZBoz7s8UxXM+vGwY1DkpS2j7NQ7jSpZepWxiaBrCVuuJXslLpEVaoQforvSgjiuGvWgrYMsJ1/j
Xk5NlVhSRvbJmuwWyeSgrDKXeaGd2jUkZpLoV+1czdK3NNZkYijmEk2A7EBM/qua3NDVnWdLjPOz
TxMICVqr8clGVXt1WdGTUXFt6tqbJCoQ7x/S6sqwvsoTNE4TRqQV5FQV4SgPlUd8a2Peqocwx9ui
0AYT8DzHVGcpJBrG94sZVvgrZtmoeqVpdcsQnwO4v0f3EQ0OkW8Xlj/LKNpUU+hg0VostttTFDEH
YHSrU4mBqHbeMf5eR0/gpQV3XTs7AGiiyBeJ4hhxyM+ZdWRi5HdEaabddIXp+66ScgCOTQxNreDA
D8E9+EngZsI1BjAHMiISOYGqoqGtZNy+gWKaBHkWtqRBDUQFVjQqwuxhAXBCznMYi2Cn5a1uTQVM
WoGtmk2RspwscZJLMda3nQnfDFlXbm7ik5xPyotUrgU4I+udJNdOFbKEZxWYlc4lMyXVFRxjxLBM
bGOLZmzbiPurp5CVnyVkDTpATy+JtuGllPTQlryTC5fPVKmbStDgPEQ4UpVpQeo2TpnB4fBig7Nh
E+e2yqloio7BLUOBSOUE6lqkO9Iwfx8qJGq8oRF1YYxC4mez5BIUpE3bAMWZpWE6RdF4kIWYx0JY
wwzzgKa6JRpYbWUqDLLUr4BfvORCSxKgsoqiS5gyjATZPnlgLE6aZ6QsCxFGm9MkUA55AYNCgG4h
kwnaj1RyiKjhH22xF4lrztgCMGoV45RGmQcP4AOAY8BY7pzGinLyA5oxwuhkSKcJb5eZL8BsPxLS
lAF4LInOGJkW8jlkstVie9yVW3OpuQAhDWOMTYFqj268dNNFKxWooRk1LgXfmMqt4eYmQIkrR4cq
cbRpzUofB0YS6aTfgTtgEn5xlj6ZkF32IVaTTrSK6DJAsBIbVWQJWKRarVFcWOwNFtBniC9xaIlA
jRxoAUlTHOXuA25AJlA4mnFQgkZ8CkQIpBuTbNBC5xTOSh/i7kinChIDnNnEAA==


--===============0201354860==--