diff options
| author | unknown <monty@narttu.mysql.fi> | 2003-03-18 11:17:48 +0200 |
|---|---|---|
| committer | unknown <monty@narttu.mysql.fi> | 2003-03-18 11:17:48 +0200 |
| commit | aa08887f7b724d8fc07d2d807d4b0b364ac937a7 (patch) | |
| tree | a7bad6bcbb23f23c615a80983400f8c52ae5b2f3 /sql/sql_union.cc | |
| parent | 8cb27d2ff15fcf1b064c966ef037b4be5f3c2fee (diff) | |
| download | mariadb-git-aa08887f7b724d8fc07d2d807d4b0b364ac937a7.tar.gz | |
Fixes to avoid errors from valgrind
Fixed problem with 'wrong packet number' in union
include/my_global.h:
Fix for valgrind
mysql-test/t/rpl_rotate_logs.test:
Fix to avoid timeing problem
sql/item.h:
Indentation change
sql/set_var.cc:
Fix to avoid reference to uninitialized memory
sql/sql_select.cc:
More DBUG_PRINT messages
Fixed problem with 'wrong packet number' in union (tmp_join.error was not correctly reset)
sql/sql_union.cc:
Simple code cleanup
strings/ctype-simple.c:
Fix for valgrind
Diffstat (limited to 'sql/sql_union.cc')
| -rw-r--r-- | sql/sql_union.cc | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/sql/sql_union.cc b/sql/sql_union.cc index 607f3007d1d..5f7a1e44bde 100644 --- a/sql/sql_union.cc +++ b/sql/sql_union.cc @@ -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) { |