List:Commits« Previous MessageNext Message »
From:Konstantin Osipov Date:November 10 2010 2:52pm
Subject:bzr push into mysql-5.5-runtime branch (kostja:3191 to 3192)
View as plain text  
 3192 Konstantin Osipov	2010-11-10
      Review comments.

    modified:
      mysql-test/r/flush_read_lock.result
      mysql-test/t/flush_read_lock.test
 3191 Dmitry Lenev	2010-11-09
      More changes to draft patch refactoring global read
      lock implementation. Makes GRL yet another type of
      metadata lock and thus exposes it to deadlock detector
      in MDL subsystem.
      
      Solves bugs #54673 "It takes too long to get readlock for
      'FLUSH TABLES WITH READ LOCK'" and #57006 "Deadlock between
      HANDLER and FLUSH TABLES WITH READ LOCK".
      
      Work-in-progress. Solve problems with deadlocks within
      events subsystem. Move opening and updating of event table
      out of critical section protecting in-memory queue.

    modified:
      sql/event_data_objects.cc
      sql/event_data_objects.h
      sql/event_db_repository.cc
      sql/event_db_repository.h
      sql/event_queue.cc
=== 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: useless for push emails).
Thread
bzr push into mysql-5.5-runtime branch (kostja:3191 to 3192) Konstantin Osipov10 Nov