From a47998cccc1e35c18f422c1ee6c6a8f48e78b533 Mon Sep 17 00:00:00 2001 From: Marc Alff Date: Thu, 21 Jan 2010 17:57:57 -0700 Subject: [PATCH] Fixed merge problem (naming of CRYPTO_dynlock_value::lock in the tests) --- mysql-test/suite/perfschema/r/dml_setup_instruments.result | 3 +-- mysql-test/suite/perfschema/t/dml_setup_instruments.test | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/mysql-test/suite/perfschema/r/dml_setup_instruments.result b/mysql-test/suite/perfschema/r/dml_setup_instruments.result index d680f8960d5..53d15e0a510 100644 --- a/mysql-test/suite/perfschema/r/dml_setup_instruments.result +++ b/mysql-test/suite/perfschema/r/dml_setup_instruments.result @@ -16,10 +16,9 @@ wait/synch/mutex/sql/LOCK_delayed_insert YES YES wait/synch/mutex/sql/LOCK_delayed_status YES YES select * from performance_schema.SETUP_INSTRUMENTS where name like 'Wait/Synch/Rwlock/sql/%' - and name not in ('wait/synch/mutex/sql/CRYPTO_dynlock_value::lock') + and name not in ('wait/synch/rwlock/sql/CRYPTO_dynlock_value::lock') order by name limit 10; NAME ENABLED TIMED -wait/synch/rwlock/sql/CRYPTO_dynlock_value::lock YES YES wait/synch/rwlock/sql/LOCK_dboptions YES YES wait/synch/rwlock/sql/LOCK_grant YES YES wait/synch/rwlock/sql/LOCK_system_variables_hash YES YES diff --git a/mysql-test/suite/perfschema/t/dml_setup_instruments.test b/mysql-test/suite/perfschema/t/dml_setup_instruments.test index c6631e42612..b82cde15fb5 100644 --- a/mysql-test/suite/perfschema/t/dml_setup_instruments.test +++ b/mysql-test/suite/perfschema/t/dml_setup_instruments.test @@ -40,7 +40,7 @@ select * from performance_schema.SETUP_INSTRUMENTS select * from performance_schema.SETUP_INSTRUMENTS where name like 'Wait/Synch/Rwlock/sql/%' - and name not in ('wait/synch/mutex/sql/CRYPTO_dynlock_value::lock') + and name not in ('wait/synch/rwlock/sql/CRYPTO_dynlock_value::lock') order by name limit 10; # COND_handler_count is dependent on the build (Windows only)