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 branch '5.5' into 10.1

Browse Source
This commit is contained in:
Oleksandr Byelkin
2019-06-12 22:54:46 +02:00
parent 56c60b2fc5 7a7d9904e1
commit 5b65d61d93
36 changed files with 778 additions and 207 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/sql_join_cache.cc
View File

@ -2156,7 +2156,8 @@ enum_nested_loop_state JOIN_CACHE::join_records(bool skip_last)
}
finish:
if (outer_join_first_inner)
if (outer_join_first_inner &&
join_tab->first_inner == join_tab->first_unmatched)
{
/*
All null complemented rows have been already generated for all