database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Fixed LP bug #702310 / bug #59493.

Browse Source 
An assertion failure was triggered for a 6-way join query that uses two
join buffers.
The failure happened because every call of the function flush_cached_records()
saved and restored status of all tables before the table join_tab. It
must do it only for those of them that follow the last table that uses
a join buffer.
This commit is contained in:
Igor Babaev
2011-01-14 02:05:10 -08:00
parent d0e8dbc4a3
commit c8e56e3713
3 changed files with 116 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/sql_select.cc
View File

@ -11957,7 +11957,8 @@ flush_cached_records(JOIN *join,JOIN_TAB *join_tab,bool skip_last)
return error < 0 ? NESTED_LOOP_NO_MORE_ROWS: NESTED_LOOP_ERROR;
}
for (JOIN_TAB *tmp=join->join_tab; tmp != join_tab ; tmp++)
for (JOIN_TAB *tmp= join_tab-1;
tmp >= join->join_tab && !tmp->cache.buff; tmp--)
{
tmp->status=tmp->table->status;
tmp->table->status=0;
@ -12015,7 +12016,8 @@ flush_cached_records(JOIN *join,JOIN_TAB *join_tab,bool skip_last)
reset_cache_write(&join_tab->cache);
if (error > 0) // Fatal error
return NESTED_LOOP_ERROR; /* purecov: inspected */
for (JOIN_TAB *tmp2=join->join_tab; tmp2 != join_tab ; tmp2++)
for (JOIN_TAB *tmp2= join_tab-1;
tmp2 >= join->join_tab && !tmp2->cache.buff; tmp2--)
tmp2->table->status=tmp2->status;
return NESTED_LOOP_OK;
}