diff options
| author | Sergei Krivonos <sergeikrivonos@gmail.com> | 2021-11-09 20:06:22 +0200 |
|---|---|---|
| committer | Sergei Krivonos <sergeikrivonos@gmail.com> | 2021-11-19 16:39:04 +0200 |
| commit | 34f53bf941db1f2348f964b7375f0f567c6c6f12 (patch) | |
| tree | 797bc4e54bb7176571c155f0b6bc32d09f55ae23 /sql/opt_range.cc | |
| parent | 26663cf9a715fd8e330b709fe9aa728e8f47b332 (diff) | |
| download | mariadb-git-bb-10.7-release.tar.gz | |
MDEV-23766: fix by assert (Windows)bb-10.7-releasebb-10.7-MDEV-23766
Diffstat (limited to 'sql/opt_range.cc')
| -rw-r--r-- | sql/opt_range.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sql/opt_range.cc b/sql/opt_range.cc index af703cfcf5c..9dc1bcf733f 100644 --- a/sql/opt_range.cc +++ b/sql/opt_range.cc @@ -5132,9 +5132,8 @@ TABLE_READ_PLAN *get_best_disjunct_quick(PARAM *param, SEL_IMERGE *imerge, n_child_scans))) DBUG_RETURN(NULL); - Json_writer_object trace_best_disjunct = named_trace - ? Json_writer_object(thd, "best_disjunct_quick") - : Json_writer_object(thd); + const char* trace_best_disjunct_obj_name= named_trace ? "best_disjunct_quick" : nullptr; + Json_writer_object trace_best_disjunct(thd, trace_best_disjunct_obj_name); Json_writer_array to_merge(thd, "indexes_to_merge"); /* Collect best 'range' scan for each of disjuncts, and, while doing so, @@ -5678,7 +5677,7 @@ void print_keyparts(THD *thd, KEY *key, uint key_parts) DBUG_ASSERT(thd->trace_started()); KEY_PART_INFO *part= key->key_part; - Json_writer_array keyparts= Json_writer_array(thd, "keyparts"); + Json_writer_array keyparts(thd, "keyparts"); for(uint i= 0; i < key_parts; i++, part++) keyparts.add(part->field->field_name); } |