percona/percona-toolkit
1
0
Fork 0
mirror of https://github.com/percona/percona-toolkit.git synced 2025-09-12 06:00:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.0' into pt-stalk-collect-prepared-statements-LP1642750

Browse Source
This commit is contained in:
guriandoro
2017-03-22 16:34:34 -04:00
parent 32745039b5 759ee9196e
commit 0e5a08342d
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/bash/collect.sh
View File

@@ -246,7 +246,7 @@ collect() {
(echo $ts; transactions) >>"$d/$p-transactions" & (echo $ts; transactions) >>"$d/$p-transactions" &
fi fi
if [ [ "${mysql_version}" '>' "5.6" ] && [ $ps_instrumentation_enabled == "yes"] ]; then if [ "${mysql_version}" '>' "5.6" ] && [ $ps_instrumentation_enabled == "yes"]; then
ps_locks_transactions "$d/$p-ps-locks-transactions" ps_locks_transactions "$d/$p-ps-locks-transactions"
fi fi

4
sandbox/servers/5.7/my.sandbox.cnf
View File

@@ -31,5 +31,5 @@ lower_case_table_names = 0
# fkc test # fkc test
binlog_format = STATEMENT binlog_format = STATEMENT
performance_schema = ON performance_schema = ON
performance-schema-instrument='wait/lock/metadata/sql/mdl=ON' #performance-schema-instrument='wait/lock/metadata/sql/mdl=ON'
performance-schema-instrument='transaction=ON' #performance-schema-instrument='transaction=ON'