summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc Alff <marc.alff@oracle.com>2012-09-07 19:38:04 +0200
committerMarc Alff <marc.alff@oracle.com>2012-09-07 19:38:04 +0200
commit3d7d345620705b3032c6389f71e52c79d51415cf (patch)
tree782efaafc78bb4f2f9eb45156f74e9ba41e57269
parente5f925b066b46bbd039d610154ba9e9fc9ead914 (diff)
parente74c84d25eea0204f3cdf8e05a4a0cc0c844f304 (diff)
downloadmariadb-git-3d7d345620705b3032c6389f71e52c79d51415cf.tar.gz
Local merge
-rw-r--r--mysql-test/suite/perfschema/r/func_file_io.result17
-rw-r--r--mysql-test/suite/perfschema/t/func_file_io.test7
2 files changed, 24 insertions, 0 deletions
diff --git a/mysql-test/suite/perfschema/r/func_file_io.result b/mysql-test/suite/perfschema/r/func_file_io.result
index c95fae94803..7849b97f0ed 100644
--- a/mysql-test/suite/perfschema/r/func_file_io.result
+++ b/mysql-test/suite/perfschema/r/func_file_io.result
@@ -1,6 +1,7 @@
UPDATE performance_schema.setup_instruments SET enabled = 'NO', timed = 'YES';
UPDATE performance_schema.setup_instruments SET enabled = 'YES'
WHERE name LIKE 'wait/io/file/%';
+flush status;
DROP TABLE IF EXISTS t1;
CREATE TABLE t1 (id INT PRIMARY KEY, b CHAR(100) DEFAULT 'initial value')
ENGINE=MyISAM;
@@ -113,3 +114,19 @@ WHERE p.PROCESSLIST_ID = 1
GROUP BY h.EVENT_NAME
HAVING TOTAL_WAIT > 0;
UPDATE performance_schema.setup_instruments SET enabled = 'YES';
+show status like "performance_schema%";
+Variable_name Value
+Performance_schema_cond_classes_lost 0
+Performance_schema_cond_instances_lost 0
+Performance_schema_file_classes_lost 0
+Performance_schema_file_handles_lost 0
+Performance_schema_file_instances_lost 0
+Performance_schema_locker_lost 0
+Performance_schema_mutex_classes_lost 0
+Performance_schema_mutex_instances_lost 0
+Performance_schema_rwlock_classes_lost 0
+Performance_schema_rwlock_instances_lost 0
+Performance_schema_table_handles_lost 0
+Performance_schema_table_instances_lost 0
+Performance_schema_thread_classes_lost 0
+Performance_schema_thread_instances_lost 0
diff --git a/mysql-test/suite/perfschema/t/func_file_io.test b/mysql-test/suite/perfschema/t/func_file_io.test
index e8b01a10bd1..3de26cfcb8e 100644
--- a/mysql-test/suite/perfschema/t/func_file_io.test
+++ b/mysql-test/suite/perfschema/t/func_file_io.test
@@ -12,6 +12,9 @@ UPDATE performance_schema.setup_instruments SET enabled = 'NO', timed = 'YES';
UPDATE performance_schema.setup_instruments SET enabled = 'YES'
WHERE name LIKE 'wait/io/file/%';
+# reset lost counters
+flush status;
+
--disable_warnings
DROP TABLE IF EXISTS t1;
--enable_warnings
@@ -182,3 +185,7 @@ HAVING TOTAL_WAIT > 0;
# Clean-up.
UPDATE performance_schema.setup_instruments SET enabled = 'YES';
+
+# In case of failure, will indicate the root cause
+show status like "performance_schema%";
+