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

Merge 10.0.14 into 10.1

Browse Source
This commit is contained in:
Sergei Golubchik
2014-10-15 12:59:13 +02:00
parent f947f73b2b f1afc003ee
commit f62c12b405
2115 changed files with 87968 additions and 80173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/suite/perfschema/r/ortho_iter.result
View File

@ -1,4 +1,6 @@
drop procedure if exists check_instrument;
truncate table performance_schema.events_statements_summary_by_digest;
flush status;
create procedure check_instrument(in instr_name varchar(128))
begin
declare count_expected integer;

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

@ -9,6 +9,10 @@
drop procedure if exists check_instrument;
--enable_warnings
# reset counters
truncate table performance_schema.events_statements_summary_by_digest;
flush status;
delimiter $;
create procedure check_instrument(in instr_name varchar(128))
begin