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

Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1

Browse Source 
into sanja.is.com.ua:/home/bell/mysql/bk/work-print_subselect-4.1
This commit is contained in:
bell@sanja.is.com.ua
2003-11-03 20:43:21 +02:00
parent d03bdc7628 1796d50df3
commit dde384d9ea
31 changed files with 1393 additions and 523 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sql/sql_select.cc
View File

@ -982,7 +982,7 @@ JOIN::optimize()
}
}
if (select_lex->master_unit()->dependent)
if (select_lex->master_unit()->uncacheable)
{
if (!(tmp_join= (JOIN*)thd->alloc(sizeof(JOIN))))
DBUG_RETURN(-1);
@ -1053,11 +1053,11 @@ JOIN::reinit()
bool
JOIN::save_join_tab()
{
if (!join_tab_save && select_lex->master_unit()->dependent)
if (!join_tab_save && select_lex->master_unit()->uncacheable)
{
if (!(join_tab_save= (JOIN_TAB*) thd->alloc(sizeof(JOIN_TAB) * tables)))
if (!(join_tab_save= (JOIN_TAB*)thd->memdup((gptr) join_tab,
sizeof(JOIN_TAB) * tables)))
return 1;
memcpy(join_tab_save, join_tab, sizeof(JOIN_TAB) * tables);
}
return 0;
}