summaryrefslogtreecommitdiff
path: root/mysql-test/suite/perfschema
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2021-09-16 20:17:12 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2021-09-16 20:17:12 +0300
commit03c09837fc26822ba2332d9acc3e652b8d010d4c (patch)
treee03ceb8bd6282ab144446b9f5f7fb66188b25daa /mysql-test/suite/perfschema
parentea52a3eb9795f1ae04a4f9c2be4c81e43dc86c15 (diff)
parentc430aa72abbdccb1ece7f0d65b49a6b48e7c5ba7 (diff)
downloadmariadb-git-03c09837fc26822ba2332d9acc3e652b8d010d4c.tar.gz
Merge 10.5 into 10.6
Diffstat (limited to 'mysql-test/suite/perfschema')
-rw-r--r--mysql-test/suite/perfschema/t/transaction_nested_events-master.opt2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/suite/perfschema/t/transaction_nested_events-master.opt b/mysql-test/suite/perfschema/t/transaction_nested_events-master.opt
index d68f0498edf..0583801ec98 100644
--- a/mysql-test/suite/perfschema/t/transaction_nested_events-master.opt
+++ b/mysql-test/suite/perfschema/t/transaction_nested_events-master.opt
@@ -3,7 +3,7 @@
--loose-performance_schema_events_statements_history_size=20
--loose-performance_schema_events_statements_history_long_size=50
--loose-performance_schema_events_transactions_history_long_size=50
---loose-performance_schema_max_thread_instances=30
+--loose-performance_schema_max_thread_instances=60
--loose-performance-schema-consumer-events-stages-current=OFF
--loose-performance-schema-consumer-events-stages-history=OFF