diff options
author | Marc Alff <marc.alff@oracle.com> | 2010-12-01 18:56:46 +0100 |
---|---|---|
committer | Marc Alff <marc.alff@oracle.com> | 2010-12-01 18:56:46 +0100 |
commit | 4b86f39953248b3d37ed33c72ad90a50457bbd49 (patch) | |
tree | 222075f82e960c6a4218fed635a607fd56ac21e4 /mysql-test/suite/perfschema/r | |
parent | 4372875aa1fb307c33531ec63aa83bb7ae3932e9 (diff) | |
parent | 989e682bb0483c574caeeae86c8cc825f2e4ff5c (diff) | |
download | mariadb-git-4b86f39953248b3d37ed33c72ad90a50457bbd49.tar.gz |
Local merge
Diffstat (limited to 'mysql-test/suite/perfschema/r')
-rw-r--r-- | mysql-test/suite/perfschema/r/myisam_file_io.result | 1 | ||||
-rw-r--r-- | mysql-test/suite/perfschema/r/thread_cache.result | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/mysql-test/suite/perfschema/r/myisam_file_io.result b/mysql-test/suite/perfschema/r/myisam_file_io.result index 287abd43d74..5cdcf6ac789 100644 --- a/mysql-test/suite/perfschema/r/myisam_file_io.result +++ b/mysql-test/suite/perfschema/r/myisam_file_io.result @@ -16,6 +16,7 @@ operation, number_of_bytes, substring(object_name, locate("no_index_tab", object_name)) as short_name from performance_schema.events_waits_history_long where operation not like "tell" + and event_name like "wait/io/file/myisam/%" order by thread_id, event_id; event_name short_source operation number_of_bytes short_name wait/io/file/myisam/kfile mi_create.c: create NULL no_index_tab.MYI diff --git a/mysql-test/suite/perfschema/r/thread_cache.result b/mysql-test/suite/perfschema/r/thread_cache.result index de4d19f9c64..f64cadc2705 100644 --- a/mysql-test/suite/perfschema/r/thread_cache.result +++ b/mysql-test/suite/perfschema/r/thread_cache.result @@ -1,3 +1,4 @@ +flush status; SET @saved_thread_cache_size = @@global.thread_cache_size; set global thread_cache_size = 0; show variables like "thread_cache_size"; @@ -32,3 +33,7 @@ select @thread_id_increment; @thread_id_increment 1 set global thread_cache_size = @saved_thread_cache_size; +show status like "performance_schema_thread%"; +Variable_name Value +Performance_schema_thread_classes_lost 0 +Performance_schema_thread_instances_lost 0 |