Merge from mysql-5.5-bugteam to mysql-5.5-runtime

Text conflict in mysql-test/suite/perfschema/r/dml_setup_instruments.result
Text conflict in mysql-test/suite/perfschema/r/global_read_lock.result
Text conflict in mysql-test/suite/perfschema/r/server_init.result
Text conflict in mysql-test/suite/perfschema/t/global_read_lock.test
Text conflict in mysql-test/suite/perfschema/t/server_init.test

1 files changed, 25 insertions, 25 deletions

diff --git a/mysql-test/suite/perfschema/t/func_mutex.test b/mysql-test/suite/perfschema/t/func_mutex.test
index 624f5734c40..51cbc77790e 100644
--- a/mysql-test/suite/perfschema/t/func_mutex.test
+++ b/mysql-test/suite/perfschema/t/func_mutex.test
@@ -22,9 +22,9 @@
 --source include/not_embedded.inc
 --source include/have_perfschema.inc
 
-UPDATE performance_schema.SETUP_INSTRUMENTS SET enabled = 'NO', timed = 'YES';
+UPDATE performance_schema.setup_instruments SET enabled = 'NO', timed = 'YES';
 
-UPDATE performance_schema.SETUP_INSTRUMENTS SET enabled = 'YES'
+UPDATE performance_schema.setup_instruments SET enabled = 'YES'
 WHERE name LIKE 'wait/synch/mutex/%'
    OR name LIKE 'wait/synch/rwlock/%';
 
@@ -46,41 +46,41 @@ INSERT INTO t1 (id) VALUES (1), (2), (3), (4), (5), (6), (7), (8);
 # FM2: Count for mutex should not increase with instrumentation disabled
 #
 
-TRUNCATE TABLE performance_schema.EVENTS_WAITS_HISTORY_LONG;
-TRUNCATE TABLE performance_schema.EVENTS_WAITS_HISTORY;
-TRUNCATE TABLE performance_schema.EVENTS_WAITS_CURRENT;
+TRUNCATE TABLE performance_schema.events_waits_history_long;
+TRUNCATE TABLE performance_schema.events_waits_history;
+TRUNCATE TABLE performance_schema.events_waits_current;
 
 SELECT * FROM t1 WHERE id = 1;
 
 SET @before_count = (SELECT SUM(TIMER_WAIT)
-                     FROM performance_schema.EVENTS_WAITS_HISTORY_LONG
+                     FROM performance_schema.events_waits_history_long
                      WHERE (EVENT_NAME = 'wait/synch/mutex/sql/LOCK_open'));
 
 SELECT * FROM t1;
 
 SET @after_count = (SELECT SUM(TIMER_WAIT)
-                    FROM performance_schema.EVENTS_WAITS_HISTORY_LONG
+                    FROM performance_schema.events_waits_history_long
                     WHERE (EVENT_NAME = 'wait/synch/mutex/sql/LOCK_open'));
 
 SELECT IF((@after_count - @before_count) > 0, 'Success', 'Failure') test_fm1_timed;
 
-UPDATE performance_schema.SETUP_INSTRUMENTS SET enabled = 'NO'
+UPDATE performance_schema.setup_instruments SET enabled = 'NO'
 WHERE NAME = 'wait/synch/mutex/sql/LOCK_open';
 
-TRUNCATE TABLE performance_schema.EVENTS_WAITS_HISTORY_LONG;
-TRUNCATE TABLE performance_schema.EVENTS_WAITS_HISTORY;
-TRUNCATE TABLE performance_schema.EVENTS_WAITS_CURRENT;
+TRUNCATE TABLE performance_schema.events_waits_history_long;
+TRUNCATE TABLE performance_schema.events_waits_history;
+TRUNCATE TABLE performance_schema.events_waits_current;
 
 SELECT * FROM t1 WHERE id = 1;
 
 SET @before_count = (SELECT SUM(TIMER_WAIT)
-                     FROM performance_schema.EVENTS_WAITS_HISTORY_LONG
+                     FROM performance_schema.events_waits_history_long
                      WHERE (EVENT_NAME = 'wait/synch/mutex/sql/LOCK_open'));
 
 SELECT * FROM t1;
 
 SET @after_count = (SELECT SUM(TIMER_WAIT)
-                    FROM performance_schema.EVENTS_WAITS_HISTORY_LONG
+                    FROM performance_schema.events_waits_history_long
                     WHERE (EVENT_NAME = 'wait/synch/mutex/sql/LOCK_open'));
 
 SELECT IF((COALESCE(@after_count, 0) - COALESCE(@before_count, 0)) = 0, 'Success', 'Failure') test_fm2_timed;
@@ -89,45 +89,45 @@ SELECT IF((COALESCE(@after_count, 0) - COALESCE(@before_count, 0)) = 0, 'Success
 # Repeat for RW-lock
 #
 
-TRUNCATE TABLE performance_schema.EVENTS_WAITS_HISTORY_LONG;
-TRUNCATE TABLE performance_schema.EVENTS_WAITS_HISTORY;
-TRUNCATE TABLE performance_schema.EVENTS_WAITS_CURRENT;
+TRUNCATE TABLE performance_schema.events_waits_history_long;
+TRUNCATE TABLE performance_schema.events_waits_history;
+TRUNCATE TABLE performance_schema.events_waits_current;
 
 SELECT * FROM t1 WHERE id = 1;
 
 SET @before_count = (SELECT SUM(TIMER_WAIT)
-                     FROM performance_schema.EVENTS_WAITS_HISTORY_LONG
+                     FROM performance_schema.events_waits_history_long
                      WHERE (EVENT_NAME = 'wait/synch/rwlock/sql/LOCK_grant'));
 
 SELECT * FROM t1;
 
 SET @after_count = (SELECT SUM(TIMER_WAIT)
-                    FROM performance_schema.EVENTS_WAITS_HISTORY_LONG
+                    FROM performance_schema.events_waits_history_long
                     WHERE (EVENT_NAME = 'wait/synch/rwlock/sql/LOCK_grant'));
 
 SELECT IF((@after_count - @before_count) > 0, 'Success', 'Failure') test_fm1_rw_timed;
 
-UPDATE performance_schema.SETUP_INSTRUMENTS SET enabled = 'NO'
+UPDATE performance_schema.setup_instruments SET enabled = 'NO'
 WHERE NAME = 'wait/synch/rwlock/sql/LOCK_grant';
 
-TRUNCATE TABLE performance_schema.EVENTS_WAITS_HISTORY_LONG;
-TRUNCATE TABLE performance_schema.EVENTS_WAITS_HISTORY;
-TRUNCATE TABLE performance_schema.EVENTS_WAITS_CURRENT;
+TRUNCATE TABLE performance_schema.events_waits_history_long;
+TRUNCATE TABLE performance_schema.events_waits_history;
+TRUNCATE TABLE performance_schema.events_waits_current;
 
 SELECT * FROM t1 WHERE id = 1;
 
 SET @before_count = (SELECT SUM(TIMER_WAIT)
-                     FROM performance_schema.EVENTS_WAITS_HISTORY_LONG
+                     FROM performance_schema.events_waits_history_long
                      WHERE (EVENT_NAME = 'wait/synch/rwlock/sql/LOCK_grant'));
 
 SELECT * FROM t1;
 
 SET @after_count = (SELECT SUM(TIMER_WAIT)
-                    FROM performance_schema.EVENTS_WAITS_HISTORY_LONG
+                    FROM performance_schema.events_waits_history_long
                     WHERE (EVENT_NAME = 'wait/synch/rwlock/sql/LOCK_grant'));
 
 SELECT IF((COALESCE(@after_count, 0) - COALESCE(@before_count, 0)) = 0, 'Success', 'Failure') test_fm2_rw_timed;
 
 # Clean-up.
-UPDATE performance_schema.SETUP_INSTRUMENTS SET enabled = 'YES';
+UPDATE performance_schema.setup_instruments SET enabled = 'YES';
 DROP TABLE t1;