mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-04-26 10:15:29 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '5.5' into 10.0

Browse source
This commit is contained in:
Vicențiu Ciorbaru 2017-03-03 01:37:54 +02:00
commit 1acfa942ed
154 changed files with 3475 additions and 1793 deletions
Download patch file Download diff file Expand all files Collapse all files

5
sql/sql_join_cache.cc
View file

@ -589,6 +589,11 @@ void JOIN_CACHE::create_remaining_fields()
{
MY_BITMAP *rem_field_set;
TABLE *table= tab->table;
#if MYSQL_VERSION_ID < 100204
empty_record(table);
#else
#error remove
#endif
if (all_read_fields)
rem_field_set= table->read_set;