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

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

Browse Source
This commit is contained in:
gkodinov/kgeorge@macbook.gmz
2006-10-17 19:22:13 +03:00
parent a64ae1844d
commit 8e7f0fe785
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 Reuse TABLE * and JOIN_TAB if already allocated by a previous call
to this function through JOIN::exec (may happen for sub-queries). 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 */ DBUG_RETURN(TRUE); /* purecov: inspected */
if (join->tmp_join) 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)))) (JOIN_TAB*) join->thd->alloc(sizeof(JOIN_TAB))))
DBUG_RETURN(TRUE); /* purecov: inspected */ DBUG_RETURN(TRUE); /* purecov: inspected */
if (join->tmp_join) 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; tableptr= join->table_reexec;
join_tab= join->join_tab_cache; join_tab= join->join_tab_reexec;
join->join_tab=join_tab; join->join_tab=join_tab;
join->table=tableptr; tableptr[0]=tmp_table; join->table=tableptr; tableptr[0]=tmp_table;

8
sql/sql_select.h
View File

@ -290,8 +290,8 @@ public:
excessive memory usage. excessive memory usage.
*/ */
SORT_FIELD *sortorder; // make_unireg_sortorder() SORT_FIELD *sortorder; // make_unireg_sortorder()
TABLE **table_cache; // make_simple_join() TABLE **table_reexec; // make_simple_join()
JOIN_TAB *join_tab_cache; // make_simple_join() JOIN_TAB *join_tab_reexec; // make_simple_join()
/* end of allocation caching storage */ /* end of allocation caching storage */
JOIN(THD *thd_arg, List<Item> &fields_arg, ulonglong select_options_arg, JOIN(THD *thd_arg, List<Item> &fields_arg, ulonglong select_options_arg,
@ -320,8 +320,8 @@ public:
exec_tmp_table1= 0; exec_tmp_table1= 0;
exec_tmp_table2= 0; exec_tmp_table2= 0;
sortorder= 0; sortorder= 0;
table_cache= 0; table_reexec= 0;
join_tab_cache= 0; join_tab_reexec= 0;
thd= thd_arg; thd= thd_arg;
sum_funcs= sum_funcs2= 0; sum_funcs= sum_funcs2= 0;
procedure= 0; procedure= 0;