bzr commit into mysql-5.6-next-mr branch (kostja:3082) Bug#46272

[Konstantin Osipov]

#At file:///opt/local/work/next-4284-stage/ based on revid:kostja@stripped

 3082 Konstantin Osipov	2010-01-29
      Bug#46272, rename the sync point.

    modified:
      mysql-test/r/mdl_sync.result
      mysql-test/r/truncate_coverage.result
      mysql-test/t/mdl_sync.test
      mysql-test/t/truncate_coverage.test
      sql/mdl.cc
=== modified file 'mysql-test/r/mdl_sync.result'
--- a/mysql-test/r/mdl_sync.result	2010-01-29 14:39:23 +0000
+++ b/mysql-test/r/mdl_sync.result	2010-01-29 15:10:10 +0000
@@ -10,7 +10,7 @@ alter table t1 rename t3;
 connection: default
 set debug_sync= 'now WAIT_FOR parked';
 connection: con2
-set debug_sync='mdl_acquire_exclusive_locks_wait SIGNAL go';
+set debug_sync='mdl_acquire_lock_wait SIGNAL go';
 drop table t1,t2;
 connection: con1
 connection: default
@@ -1997,7 +1997,7 @@ SET DEBUG_SYNC= 'now WAIT_FOR locked';
 # Now INSERT has a MDL on the non-existent table t1.
 #
 # Continue the INSERT once CREATE waits for exclusive lock
-SET DEBUG_SYNC= 'mdl_acquire_exclusive_locks_wait SIGNAL finish';
+SET DEBUG_SYNC= 'mdl_acquire_lock_wait SIGNAL finish';
 # Try to create that table.
 CREATE TABLE t1 (c1 INT, c2 VARCHAR(100), KEY(c1));
 # Connection 2
@@ -2023,7 +2023,7 @@ SET DEBUG_SYNC= 'now WAIT_FOR locked';
 # Now INSERT has a MDL on the non-existent table t1.
 #
 # Continue the INSERT once CREATE waits for exclusive lock
-SET DEBUG_SYNC= 'mdl_acquire_exclusive_locks_wait SIGNAL finish';
+SET DEBUG_SYNC= 'mdl_acquire_lock_wait SIGNAL finish';
 # Try to create that table.
 CREATE TABLE t1 LIKE t2;
 # Connection 2

=== modified file 'mysql-test/r/truncate_coverage.result'
--- a/mysql-test/r/truncate_coverage.result	2010-01-22 05:53:57 +0000
+++ b/mysql-test/r/truncate_coverage.result	2010-01-29 15:10:10 +0000
@@ -58,7 +58,7 @@ START TRANSACTION;
 INSERT INTO t1 VALUES (2);
 #
 # connection default
-SET DEBUG_SYNC='mdl_acquire_exclusive_locks_wait SIGNAL waiting';
+SET DEBUG_SYNC='mdl_acquire_lock_wait SIGNAL waiting';
 TRUNCATE TABLE t1;
 #
 # connection con1

=== modified file 'mysql-test/t/mdl_sync.test'
--- a/mysql-test/t/mdl_sync.test	2010-01-29 14:39:23 +0000
+++ b/mysql-test/t/mdl_sync.test	2010-01-29 15:10:10 +0000
@@ -44,7 +44,7 @@ set debug_sync= 'now WAIT_FOR parked';
 
 connection con2;
 --echo connection: con2
-set debug_sync='mdl_acquire_exclusive_locks_wait SIGNAL go';
+set debug_sync='mdl_acquire_lock_wait SIGNAL go';
 --send drop table t1,t2
 
 connection con1;
@@ -2779,7 +2779,7 @@ SET DEBUG_SYNC= 'now WAIT_FOR locked';
 
 --echo #
 --echo # Continue the INSERT once CREATE waits for exclusive lock
-SET DEBUG_SYNC= 'mdl_acquire_exclusive_locks_wait SIGNAL finish';
+SET DEBUG_SYNC= 'mdl_acquire_lock_wait SIGNAL finish';
 --echo # Try to create that table.
 --send CREATE TABLE t1 (c1 INT, c2 VARCHAR(100), KEY(c1))
 
@@ -2819,7 +2819,7 @@ SET DEBUG_SYNC= 'now WAIT_FOR locked';
 
 --echo #
 --echo # Continue the INSERT once CREATE waits for exclusive lock
-SET DEBUG_SYNC= 'mdl_acquire_exclusive_locks_wait SIGNAL finish';
+SET DEBUG_SYNC= 'mdl_acquire_lock_wait SIGNAL finish';
 --echo # Try to create that table.
 --send CREATE TABLE t1 LIKE t2
 

=== modified file 'mysql-test/t/truncate_coverage.test'
--- a/mysql-test/t/truncate_coverage.test	2010-01-22 05:53:57 +0000
+++ b/mysql-test/t/truncate_coverage.test	2010-01-29 15:10:10 +0000
@@ -138,7 +138,7 @@ INSERT INTO t1 VALUES (2);
 --echo # connection default
 --connection default
 let $ID= `SELECT @id := CONNECTION_ID()`;
-SET DEBUG_SYNC='mdl_acquire_exclusive_locks_wait SIGNAL waiting';
+SET DEBUG_SYNC='mdl_acquire_lock_wait SIGNAL waiting';
 send TRUNCATE TABLE t1;
 #
 # Get the default connection ID into a variable in an invisible statement.

=== modified file 'sql/mdl.cc'
--- a/sql/mdl.cc	2010-01-29 14:59:44 +0000
+++ b/sql/mdl.cc	2010-01-29 15:10:10 +0000
@@ -1477,7 +1477,7 @@ bool MDL_context::acquire_lock_impl(MDL_
     will_wait_for(ticket);
 
     /* There is a shared or exclusive lock on the object. */
-    DEBUG_SYNC(m_thd, "mdl_acquire_exclusive_locks_wait");
+    DEBUG_SYNC(m_thd, "mdl_acquire_lock_wait");
 
     bool is_deadlock= (find_deadlock() || timed_wait(1) == VICTIM_WAKE_UP);
 


Attachment: [text/bzr-bundle] bzr/[e-mail]