diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-03-27 17:37:42 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-03-27 17:37:42 +0200 |
| commit | 80459bcbd4ca2cfd149f58c41428882fcfc49e03 (patch) | |
| tree | 4b6ef6a36cac375104bf1e619e2ec3f5db9a0535 /sql/sql_join_cache.cc | |
| parent | 2e67b9f665875928605880661fc5aa1a15175f53 (diff) | |
| parent | 7ae37ff74fc18c391bd0d3fd1fbf6afafe966435 (diff) | |
| download | mariadb-git-80459bcbd4ca2cfd149f58c41428882fcfc49e03.tar.gz | |
Merge 10.4 into 10.5
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 8fae2073b01..620c52a3f40 100644 --- a/sql/sql_join_cache.cc +++ b/sql/sql_join_cache.cc @@ -1201,7 +1201,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)) { |