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 10.0 into 10.1

Browse Source 
Also, implement MDEV-11027 a little differently from 5.5 and 10.0:

recv_apply_hashed_log_recs(): Change the return type back to void
(DB_SUCCESS was always returned).

Report progress also via systemd using sd_notifyf().
This commit is contained in:
Marko Mäkelä
2017-03-08 19:44:22 +02:00
parent bb4ef470c2 9fe92a9770
commit ad0c218a44
338 changed files with 11292 additions and 5851 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;