summaryrefslogtreecommitdiff
path: root/sql/sql_test.cc
diff options
context:
space:
mode:
authorOleksandr Byelkin <sanja@mariadb.com>2020-03-11 17:52:49 +0100
committerOleksandr Byelkin <sanja@mariadb.com>2020-03-11 17:52:49 +0100
commitfad47df9957d754bec12d4d327c77ae04f71d903 (patch)
tree58aaf6077adcb0bc0003228d30bed59687527650 /sql/sql_test.cc
parent9d7ed94f6a526748eff29dae2939a3fd341f118b (diff)
parentb7362d5fbc37dec340aeacd1fb0967c4226c022a (diff)
downloadmariadb-git-fad47df9957d754bec12d4d327c77ae04f71d903.tar.gz
Merge branch '10.4' into 10.5
Diffstat (limited to 'sql/sql_test.cc')
-rw-r--r--sql/sql_test.cc5
1 files changed, 4 insertions, 1 deletions
diff --git a/sql/sql_test.cc b/sql/sql_test.cc
index ffd42599527..e353c2a6b46 100644
--- a/sql/sql_test.cc
+++ b/sql/sql_test.cc
@@ -656,9 +656,12 @@ Memory allocated by threads: %s\n",
void print_keyuse_array_for_trace(THD *thd, DYNAMIC_ARRAY *keyuse_array)
{
+ DBUG_ASSERT(thd->trace_started());
+
Json_writer_object wrapper(thd);
Json_writer_array trace_key_uses(thd, "ref_optimizer_key_uses");
- for(uint i=0; i < keyuse_array->elements; i++)
+
+ for (uint i=0; i < keyuse_array->elements; i++)
{
KEYUSE *keyuse= (KEYUSE*)dynamic_array_ptr(keyuse_array, i);
Json_writer_object keyuse_elem(thd);