mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-16 03:52:35 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDEV-7921: main.sp_sync fails in buildbot with valgrind

Browse source 
Part 1: first 2 cases of valgrind complain. context_analysis_only can be used on non-started LEX (opening tables)

obviouse fixes in DBUG and is_lex_started assignment.
This commit is contained in:
Oleksandr Byelkin 2015-05-18 17:34:50 +02:00
parent 80333ad847
commit c1fb91ef73
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
client/mysqltest.cc
View file

@ -2667,7 +2667,7 @@ void var_query_set(VAR *var, const char *query, const char** query_end)
report_or_die("Query '%s' didn't return a result set", ds_query.str);
dynstr_free(&ds_query);
eval_expr(var, "", 0);
return;
DBUG_VOID_RETURN;
}
dynstr_free(&ds_query);

5
sql/sql_lex.cc
View file

@ -524,13 +524,14 @@ void lex_start(THD *thd)
lex->allow_sum_func= 0;
lex->in_sum_func= NULL;
lex->is_lex_started= TRUE;
lex->used_tables= 0;
lex->reset_slave_info.all= false;
lex->limit_rows_examined= 0;
lex->limit_rows_examined_cnt= ULONGLONG_MAX;
lex->var_list.empty();
lex->stmt_var_list.empty();
lex->is_lex_started= TRUE;
DBUG_VOID_RETURN;
}
@ -2642,7 +2643,7 @@ void Query_tables_list::destroy_query_tables_list()
LEX::LEX()
: explain(NULL),
result(0), arena_for_set_stmt(0), mem_root_for_set_stmt(0),
option_type(OPT_DEFAULT), sphead(0),
option_type(OPT_DEFAULT), context_analysis_only(0), sphead(0),
is_lex_started(0), limit_rows_examined_cnt(ULONGLONG_MAX)
{