database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge 5.5->5.5-mwl248

Browse Source
This commit is contained in:
Igor Babaev
2012-08-14 12:42:14 -07:00
parent 3116e3ad61 7cc2f8deca
commit 822e5da0d0
201 changed files with 6162 additions and 2267 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/suite/perfschema/disabled.def
View File

@ -9,4 +9,4 @@
# Do not use any TAB characters for whitespace.
#
##############################################################################
misc : bug#14113704 24/04/2012 Mayank issue reported causing failure.

12
mysql-test/suite/perfschema/r/func_file_io.result
View File

@ -15,6 +15,9 @@ SET @before_count = (SELECT SUM(TIMER_WAIT)
FROM performance_schema.events_waits_history_long
WHERE (EVENT_NAME = 'wait/io/file/myisam/dfile')
AND (OBJECT_NAME LIKE '%t1.MYD'));
SELECT (@before_count >= 0) as have_before_count;
have_before_count
1
SELECT IF(@before_count > 0, 'Success', 'Failure') has_instrumentation;
has_instrumentation
Success
@ -27,6 +30,9 @@ SET @after_count = (SELECT SUM(TIMER_WAIT)
FROM performance_schema.events_waits_history_long
WHERE (EVENT_NAME = 'wait/io/file/myisam/dfile')
AND (OBJECT_NAME LIKE '%t1.MYD') AND (1 = 1));
SELECT (@after_count >= 0) as have_after_count;
have_after_count
1
SELECT IF((@after_count - @before_count) > 0, 'Success', 'Failure') test_ff1_timed;
test_ff1_timed
Success
@ -35,6 +41,9 @@ SET @before_count = (SELECT SUM(TIMER_WAIT)
FROM performance_schema.events_waits_history_long
WHERE (EVENT_NAME = 'wait/io/file/myisam/dfile')
AND (OBJECT_NAME LIKE '%t1.MYD') AND (2 = 2));
SELECT (@before_count >= 0) as have_before_count;
have_before_count
1
SELECT * FROM t1 WHERE id < 6;
id b
1 initial value
@ -46,6 +55,9 @@ SET @after_count = (SELECT SUM(TIMER_WAIT)
FROM performance_schema.events_waits_history_long
WHERE (EVENT_NAME = 'wait/io/file/myisam/dfile')
AND (OBJECT_NAME LIKE '%t1.MYD') AND (3 = 3));
SELECT (@after_count >= 0) as have_after_count;
have_after_count
1
SELECT IF((COALESCE(@after_count, 0) - COALESCE(@before_count, 0)) = 0, 'Success', 'Failure') test_ff2_timed;
test_ff2_timed
Success

12
mysql-test/suite/perfschema/r/query_cache.result
View File

@ -36,9 +36,9 @@ Qcache_hits 1
select spins from performance_schema.events_waits_current order by event_name limit 1;
spins
NULL
select name from performance_schema.setup_instruments order by name limit 1;
name
wait/io/file/aria/control
select * from performance_schema.setup_timers where name='wait';
NAME TIMER_NAME
wait CYCLE
show status like "Qcache_queries_in_cache";
Variable_name Value
Qcache_queries_in_cache 1
@ -51,9 +51,9 @@ Qcache_hits 1
select spins from performance_schema.events_waits_current order by event_name limit 1;
spins
NULL
select name from performance_schema.setup_instruments order by name limit 1;
name
wait/io/file/aria/control
select * from performance_schema.setup_timers where name='wait';
NAME TIMER_NAME
wait CYCLE
show status like "Qcache_queries_in_cache";
Variable_name Value
Qcache_queries_in_cache 1

4
mysql-test/suite/perfschema/t/func_file_io.test
View File

@ -41,6 +41,7 @@ SET @before_count = (SELECT SUM(TIMER_WAIT)
WHERE (EVENT_NAME = 'wait/io/file/myisam/dfile')
AND (OBJECT_NAME LIKE '%t1.MYD'));
SELECT (@before_count >= 0) as have_before_count;
SELECT IF(@before_count > 0, 'Success', 'Failure') has_instrumentation;
SELECT * FROM t1 WHERE id < 4;
@ -50,6 +51,7 @@ SET @after_count = (SELECT SUM(TIMER_WAIT)
WHERE (EVENT_NAME = 'wait/io/file/myisam/dfile')
AND (OBJECT_NAME LIKE '%t1.MYD') AND (1 = 1));
SELECT (@after_count >= 0) as have_after_count;
SELECT IF((@after_count - @before_count) > 0, 'Success', 'Failure') test_ff1_timed;
UPDATE performance_schema.setup_instruments SET enabled='NO';
@ -59,6 +61,7 @@ SET @before_count = (SELECT SUM(TIMER_WAIT)
WHERE (EVENT_NAME = 'wait/io/file/myisam/dfile')
AND (OBJECT_NAME LIKE '%t1.MYD') AND (2 = 2));
SELECT (@before_count >= 0) as have_before_count;
SELECT * FROM t1 WHERE id < 6;
SET @after_count = (SELECT SUM(TIMER_WAIT)
@ -66,6 +69,7 @@ SET @after_count = (SELECT SUM(TIMER_WAIT)
WHERE (EVENT_NAME = 'wait/io/file/myisam/dfile')
AND (OBJECT_NAME LIKE '%t1.MYD') AND (3 = 3));
SELECT (@after_count >= 0) as have_after_count;
SELECT IF((COALESCE(@after_count, 0) - COALESCE(@before_count, 0)) = 0, 'Success', 'Failure') test_ff2_timed;
#

4
mysql-test/suite/perfschema/t/query_cache.test
View File

@ -34,7 +34,7 @@ show status like "Qcache_hits";
select spins from performance_schema.events_waits_current order by event_name limit 1;
select name from performance_schema.setup_instruments order by name limit 1;
select * from performance_schema.setup_timers where name='wait';
show status like "Qcache_queries_in_cache";
show status like "Qcache_inserts";
@ -42,7 +42,7 @@ show status like "Qcache_hits";
select spins from performance_schema.events_waits_current order by event_name limit 1;
select name from performance_schema.setup_instruments order by name limit 1;
select * from performance_schema.setup_timers where name='wait';
show status like "Qcache_queries_in_cache";
show status like "Qcache_inserts";