diff options
| author | unknown <knielsen@knielsen-hq.org> | 2013-07-09 13:15:53 +0200 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2013-07-09 13:15:53 +0200 |
| commit | 6d5f237e091ca7aa4fdd52c186af11fffc80b1c2 (patch) | |
| tree | e0328cf45705b6957195f51e5f37510935b3674c /mysql-test/suite/perfschema | |
| parent | a99356fbe72fbca61617edabc5a8928da4343c96 (diff) | |
| download | mariadb-git-6d5f237e091ca7aa4fdd52c186af11fffc80b1c2.tar.gz | |
MDEV-4506: Parallel replication: Intermediate commit.
Fix a number of failures in the test suite.
Diffstat (limited to 'mysql-test/suite/perfschema')
| -rw-r--r-- | mysql-test/suite/perfschema/r/all_instances.result | 3 | ||||
| -rw-r--r-- | mysql-test/suite/perfschema/r/dml_setup_instruments.result | 8 |
2 files changed, 7 insertions, 4 deletions
diff --git a/mysql-test/suite/perfschema/r/all_instances.result b/mysql-test/suite/perfschema/r/all_instances.result index 8ecb8dfe602..f338461f5cd 100644 --- a/mysql-test/suite/perfschema/r/all_instances.result +++ b/mysql-test/suite/perfschema/r/all_instances.result @@ -61,6 +61,7 @@ wait/synch/mutex/sql/LOCK_prepared_stmt_count wait/synch/mutex/sql/LOCK_prepare_ordered wait/synch/mutex/sql/LOCK_rpl_gtid_state wait/synch/mutex/sql/LOCK_rpl_status +wait/synch/mutex/sql/LOCK_rpl_thread_pool wait/synch/mutex/sql/LOCK_server_started wait/synch/mutex/sql/LOCK_slave_list wait/synch/mutex/sql/LOCK_slave_state @@ -122,8 +123,10 @@ wait/synch/cond/mysys/COND_alarm wait/synch/cond/mysys/my_thread_var::suspend wait/synch/cond/mysys/THR_COND_threads wait/synch/cond/sql/COND_flush_thread_cache +wait/synch/cond/sql/COND_prepare_ordered wait/synch/cond/sql/COND_queue_state wait/synch/cond/sql/COND_rpl_status +wait/synch/cond/sql/COND_rpl_thread_pool wait/synch/cond/sql/COND_server_started wait/synch/cond/sql/COND_thread_cache wait/synch/cond/sql/COND_thread_count diff --git a/mysql-test/suite/perfschema/r/dml_setup_instruments.result b/mysql-test/suite/perfschema/r/dml_setup_instruments.result index e1a5fdd11f6..38c02cc2bf4 100644 --- a/mysql-test/suite/perfschema/r/dml_setup_instruments.result +++ b/mysql-test/suite/perfschema/r/dml_setup_instruments.result @@ -38,14 +38,14 @@ order by name limit 10; NAME ENABLED TIMED wait/synch/cond/sql/COND_flush_thread_cache YES YES wait/synch/cond/sql/COND_manager YES YES +wait/synch/cond/sql/COND_parallel_entry YES YES +wait/synch/cond/sql/COND_prepare_ordered YES YES wait/synch/cond/sql/COND_queue_state YES YES wait/synch/cond/sql/COND_rpl_status YES YES +wait/synch/cond/sql/COND_rpl_thread YES YES +wait/synch/cond/sql/COND_rpl_thread_pool YES YES wait/synch/cond/sql/COND_server_started YES YES wait/synch/cond/sql/COND_thread_cache YES YES -wait/synch/cond/sql/COND_thread_count YES YES -wait/synch/cond/sql/Delayed_insert::cond YES YES -wait/synch/cond/sql/Delayed_insert::cond_client YES YES -wait/synch/cond/sql/Event_scheduler::COND_state YES YES select * from performance_schema.setup_instruments where name='Wait'; select * from performance_schema.setup_instruments |