database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

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

Browse Source 
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
This commit is contained in:
Jon Olav Hauglid
2010-11-12 12:23:17 +01:00
parent 378cdc58c1 601f4f7200
commit 936bec8e2c
244 changed files with 2466 additions and 22232 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
mysql-test/suite/perfschema/t/global_read_lock.test
View File

@@ -15,7 +15,7 @@
# Tests for PERFORMANCE_SCHEMA
#
# Test the effect of a flush tables with read lock on SETUP_ tables.
# Test the effect of a flush tables with read lock on setup_ tables.
--source include/not_embedded.inc
--source include/have_perfschema.inc
@@ -24,7 +24,7 @@ use performance_schema;
# Make test robust against errors in other tests.
# Ensure that instrumentation is turned on when we create new connection.
update performance_schema.SETUP_INSTRUMENTS set enabled='YES';
update performance_schema.setup_instruments set enabled='YES';
grant SELECT, UPDATE, LOCK TABLES on performance_schema.* to pfsuser@localhost;
flush privileges;
@@ -32,15 +32,15 @@ flush privileges;
--echo connect (con1, localhost, pfsuser, , test);
connect (con1, localhost, pfsuser, , test);
lock tables performance_schema.SETUP_INSTRUMENTS read;
lock tables performance_schema.setup_instruments read;
--disable_result_log
select * from performance_schema.SETUP_INSTRUMENTS;
select * from performance_schema.setup_instruments;
--enable_result_log
unlock tables;
lock tables performance_schema.SETUP_INSTRUMENTS write;
update performance_schema.SETUP_INSTRUMENTS set enabled='NO';
update performance_schema.SETUP_INSTRUMENTS set enabled='YES';
lock tables performance_schema.setup_instruments write;
update performance_schema.setup_instruments set enabled='NO';
update performance_schema.setup_instruments set enabled='YES';
unlock tables;
--echo connection default;
@@ -51,20 +51,20 @@ flush tables with read lock;
--echo connection con1;
connection con1;
lock tables performance_schema.SETUP_INSTRUMENTS read;
lock tables performance_schema.setup_instruments read;
--disable_result_log
select * from performance_schema.SETUP_INSTRUMENTS;
select * from performance_schema.setup_instruments;
--enable_result_log
unlock tables;
# This will block
--send
lock tables performance_schema.SETUP_INSTRUMENTS write;
lock tables performance_schema.setup_instruments write;
--echo connection default;
connection default;
let $wait_condition= select 1 from performance_schema.EVENTS_WAITS_CURRENT where event_name like "wait/synch/cond/sql/MDL_context::COND_wait_status";
let $wait_condition= select 1 from performance_schema.events_waits_current where event_name like "wait/synch/cond/sql/MDL_context::COND_wait_status";
--source include/wait_condition.inc
@@ -72,7 +72,7 @@ let $wait_condition= select 1 from performance_schema.EVENTS_WAITS_CURRENT where
select event_name,
left(source, locate(":", source)) as short_source,
timer_end, timer_wait, operation
from performance_schema.EVENTS_WAITS_CURRENT
from performance_schema.events_waits_current
where event_name like "wait/synch/cond/sql/MDL_context::COND_wait_status";
unlock tables;
@@ -80,8 +80,8 @@ unlock tables;
connection con1;
--reap
update performance_schema.SETUP_INSTRUMENTS set enabled='NO';
update performance_schema.SETUP_INSTRUMENTS set enabled='YES';
update performance_schema.setup_instruments set enabled='NO';
update performance_schema.setup_instruments set enabled='YES';
unlock tables;
disconnect con1;