database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Merge branch 'github/10.0' into 10.1

Browse Source
This commit is contained in:
Sergei Golubchik
2018-02-01 21:55:30 +01:00
parent 80d3eee072 96cb428b35
commit d4df7bc9b1
448 changed files with 8900 additions and 3321 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);