database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

Merge remote-tracking branch '5.5' into 10.0

Browse Source
This commit is contained in:
Vicențiu Ciorbaru
2018-01-24 12:29:31 +02:00
parent e431d90065 76577e1e26
commit d833bb65d5
153 changed files with 1983 additions and 676 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_join_cache.cc
View File

@ -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,
&copy);