diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-03-27 17:12:28 +0200 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-03-27 17:12:28 +0200 |
commit | 7ae37ff74fc18c391bd0d3fd1fbf6afafe966435 (patch) | |
tree | 792d8852dd9aaa06b5ddfb374f02774b18ed150c /sql/sql_join_cache.cc | |
parent | d1ff2c583f452d8e1899f800609c329c998f0a33 (diff) | |
parent | 3157fa182accab86a4dea45edbcbca4eb5157723 (diff) | |
download | mariadb-git-7ae37ff74fc18c391bd0d3fd1fbf6afafe966435.tar.gz |
Merge 10.3 into 10.4
Diffstat (limited to 'sql/sql_join_cache.cc')
-rw-r--r-- | sql/sql_join_cache.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_join_cache.cc b/sql/sql_join_cache.cc index c62d096ea01..f072a675e31 100644 --- a/sql/sql_join_cache.cc +++ b/sql/sql_join_cache.cc @@ -1200,7 +1200,7 @@ bool JOIN_CACHE::check_emb_key_usage() Item *item= ref->items[i]->real_item(); Field *fld= ((Item_field *) item)->field; CACHE_FIELD *init_copy= field_descr+flag_fields+i; - for (j= i, copy= init_copy; i < local_key_arg_fields; i++, copy++) + for (j= i, copy= init_copy; j < local_key_arg_fields; j++, copy++) { if (fld->eq(copy->field)) { |