From: Dmitry Lenev
Date: November 11 2010 5:22am
Subject: bzr commit into mysql-5.5-runtime branch (Dmitry.Lenev:3194)
List-Archive: http://lists.mysql.com/commits/123521
Message-Id: <20101111052204.BF2A7E58D2@mockturtle>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

#At file:///home/dlenev/src/bzr/mysql-5.5-rt-grl/ based on revid:dmitry.lenev@stripped

 3194 Dmitry Lenev	2010-11-11 [merge]
      Merge.

    modified:
      mysql-test/r/flush_read_lock.result
      mysql-test/t/flush_read_lock.test
=== modified file 'mysql-test/r/flush_read_lock.result'
--- a/mysql-test/r/flush_read_lock.result	2010-10-26 14:19:27 +0000
+++ b/mysql-test/r/flush_read_lock.result	2010-11-10 14:52:05 +0000
@@ -515,7 +515,7 @@ Success: Was able to run FTWRL while 'de
 # 12) Compatibility of DO statement with FTWRL depends on its
 #     expression.
 #
-# 12.a) DO with expression which does not changes base table
+# 12.a) DO with expression which does not change base table
 #       should be compatible with FTWRL.
 Success: Was able to run 'do (select count(*) from t1_base)' under FTWRL.
 Success: Was able to run 'do (select count(*) from t1_base)' with FTWRL active in another connection.
@@ -1067,7 +1067,7 @@ drop user mysqltest_u1;
 # 30) Compatibility of SELECT statement with FTWRL depends on
 #     locking mode used and on functions being invoked by it.
 #
-# 30.a) Simple SELECT which does not changes tables should be
+# 30.a) Simple SELECT which does not change tables should be
 #       compatible with FTWRL.
 Success: Was able to run 'select count(*) from t1_base' under FTWRL.
 Success: Was able to run 'select count(*) from t1_base' with FTWRL active in another connection.

=== modified file 'mysql-test/t/flush_read_lock.test'
--- a/mysql-test/t/flush_read_lock.test	2010-10-26 18:50:18 +0000
+++ b/mysql-test/t/flush_read_lock.test	2010-11-10 14:52:05 +0000
@@ -670,7 +670,7 @@ let $cleanup_stmt= ;
 --echo # 12) Compatibility of DO statement with FTWRL depends on its
 --echo #     expression.
 --echo #
---echo # 12.a) DO with expression which does not changes base table
+--echo # 12.a) DO with expression which does not change base table
 --echo #       should be compatible with FTWRL.
 let $statement= do (select count(*) from t1_base);
 let $cleanup_stmt= ;
@@ -1380,7 +1380,7 @@ drop user mysqltest_u1;
 --echo # 30) Compatibility of SELECT statement with FTWRL depends on
 --echo #     locking mode used and on functions being invoked by it.
 --echo #
---echo # 30.a) Simple SELECT which does not changes tables should be
+--echo # 30.a) Simple SELECT which does not change tables should be
 --echo #       compatible with FTWRL.
 let $statement= select count(*) from t1_base;
 let $cleanup_stmt= ;

No bundle (reason: revision is a merge).