diff options
| author | Varun Gupta <varun.gupta@mariadb.com> | 2019-01-03 05:03:57 +0530 |
|---|---|---|
| committer | Varun Gupta <varun.gupta@mariadb.com> | 2019-01-03 07:01:41 +0530 |
| commit | 4bdd97be25b70b53a0f265dfcda58db0d89ddb7c (patch) | |
| tree | 4dc3f599c89c5808d6817c25878b6104f7c4d13e /sql/sql_test.cc | |
| parent | 2c978c8292e320912440a814fcd3ba77a9e85836 (diff) | |
| download | mariadb-git-10.4-mdev6111.tar.gz | |
Fixing minor stuff in code10.4-mdev6111
Diffstat (limited to 'sql/sql_test.cc')
| -rw-r--r-- | sql/sql_test.cc | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/sql/sql_test.cc b/sql/sql_test.cc index bc51471c245..f0ac80c082d 100644 --- a/sql/sql_test.cc +++ b/sql/sql_test.cc @@ -276,9 +276,12 @@ void print_keyuse_array_for_trace(Opt_trace_context *trace, DYNAMIC_ARRAY *keyus keyuse_elem.add_member("table").add_table_name(keyuse->table->pos_in_table_list); keyuse_elem.add_member("field").add_str( (keyuse->keypart == FT_KEYPART) ? "<fulltext>" - : keyuse->table->key_info[keyuse->key] - .key_part[keyuse->keypart] - .field->field_name.str); + : (keyuse->is_for_hash_join() + ? keyuse->table->field[keyuse->keypart] + ->field_name.str + : keyuse->table->key_info[keyuse->key] + .key_part[keyuse->keypart] + .field->field_name.str)); keyuse_elem.add_member("equals").add_str(keyuse->val); keyuse_elem.add_member("null_rejecting").add_bool(keyuse->null_rejecting); } |