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

Fixes to avoid errors from valgrind

Browse Source 
Fixed problem with 'wrong packet number' in union
This commit is contained in:
monty@narttu.mysql.fi
2003-03-18 11:17:48 +02:00
parent 5dd970c335
commit a916a03916
7 changed files with 55 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sql/sql_union.cc
View File

@ -241,11 +241,13 @@ err:
DBUG_RETURN(-1);
}
int st_select_lex_unit::exec()
{
DBUG_ENTER("st_select_lex_unit::exec");
SELECT_LEX_NODE *lex_select_save= thd->lex.current_select;
SELECT_LEX *select_cursor=first_select_in_union(), *last_select;
LINT_INIT(last_select);
if (executed && !(dependent || uncacheable))
DBUG_RETURN(0);
@ -321,14 +323,9 @@ int st_select_lex_unit::exec()
thd->lex.current_select = select_cursor;
res =-1;
{
#if 0
List<Item_func_match> ftfunc_list;
ftfunc_list.empty();
#else
List<Item_func_match> empty_list;
empty_list.empty();
thd->lex.select_lex.ftfunc_list= &empty_list;
#endif
if (!thd->is_fatal_error) // Check if EOM
{
@ -360,9 +357,8 @@ int st_select_lex_unit::exec()
int st_select_lex_unit::cleanup()
{
DBUG_ENTER("st_select_lex_unit::cleanup");
int error= 0;
DBUG_ENTER("st_select_lex_unit::cleanup");
if (union_result)
{