diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2018-02-01 21:55:30 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2018-02-02 10:09:44 +0100 |
| commit | d4df7bc9b1fbdfb5c98134091a9ff998af60954f (patch) | |
| tree | dfd2f5128ccf94b6e86d2475aee23acf53fa868c /sql/sql_join_cache.cc | |
| parent | 80d3eee072025f34984e474ea160651eac9e11e5 (diff) | |
| parent | 96cb428b350ba48ee17ad9968d08f5318e48258c (diff) | |
| download | mariadb-git-d4df7bc9b1fbdfb5c98134091a9ff998af60954f.tar.gz | |
Merge branch 'github/10.0' into 10.1
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 75e69298809..4b7667f1319 100644 --- a/sql/sql_join_cache.cc +++ b/sql/sql_join_cache.cc @@ -394,7 +394,7 @@ void JOIN_CACHE::create_flag_fields() TABLE *table= tab->table; /* Create a field for the null bitmap from table if needed */ - if (tab->used_null_fields || tab->used_uneven_bit_fields) + if (tab->used_null_fields || tab->used_uneven_bit_fields) length+= add_flag_field_to_join_cache(table->null_flags, table->s->null_bytes, ©); |