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 branch 'merge-perfschema-5.6' into 10.0

Browse Source
This commit is contained in:
Sergei Golubchik
2015-06-16 12:47:58 +02:00
parent 9859d366b5 3c3724991e
commit ede08808e9
18 changed files with 17 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/suite/perfschema/t/socket_summary_by_instance_func.test
View File

@ -36,7 +36,7 @@
# happens per SQL statement within our MTR tests. And there is a significant
# difference between standard statement execution and execution via
# prepared statement.
--source ../include/no_protocol.inc
--source include/no_protocol.inc
#===================================