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

rename of the new members introduced in the fix for bug 21798

Browse Source
This commit is contained in:
unknown
2006-10-17 19:22:13 +03:00
parent c208f46b66
commit 71b67e4a53
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
sql/sql_select.cc
View File

@@ -4956,23 +4956,23 @@ make_simple_join(JOIN *join,TABLE *tmp_table)
Reuse TABLE * and JOIN_TAB if already allocated by a previous call
to this function through JOIN::exec (may happen for sub-queries).
*/
if (!join->table_cache)
if (!join->table_reexec)
{
if (!(join->table_cache= (TABLE**) join->thd->alloc(sizeof(TABLE*))))
if (!(join->table_reexec= (TABLE**) join->thd->alloc(sizeof(TABLE*))))
DBUG_RETURN(TRUE); /* purecov: inspected */
if (join->tmp_join)
join->tmp_join->table_cache= join->table_cache;
join->tmp_join->table_reexec= join->table_reexec;
}
if (!join->join_tab_cache)
if (!join->join_tab_reexec)
{
if (!(join->join_tab_cache=
if (!(join->join_tab_reexec=
(JOIN_TAB*) join->thd->alloc(sizeof(JOIN_TAB))))
DBUG_RETURN(TRUE); /* purecov: inspected */
if (join->tmp_join)
join->tmp_join->join_tab_cache= join->join_tab_cache;
join->tmp_join->join_tab_reexec= join->join_tab_reexec;
}
tableptr= join->table_cache;
join_tab= join->join_tab_cache;
tableptr= join->table_reexec;
join_tab= join->join_tab_reexec;
join->join_tab=join_tab;
join->table=tableptr; tableptr[0]=tmp_table;