mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-27 17:33:44 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Since the function definitions in pars_info_t are accessed after pars_sql()

Browse source 
returns in the query graph execution stage, we can't free pars_info_t in
pars_sql(). Instead, make pars_sql() transfer ownership of pars_info_t to
the created query graph, and make que_graph_free() free it if needed.
This commit is contained in:
osku 2006-04-06 07:52:14 +00:00
parent bef4a6cc18
commit be5145c94b
4 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
include/pars0pars.h
View file

@ -547,9 +547,8 @@ struct pars_info_struct {
ib_vector* bound_lits; /* bound literals, or NULL
(pars_bound_lit_t*) */
ibool pars_sql_owns_us;
/* if TRUE (which is the default),
pars_sql() free us before exiting */
ibool graph_owns_us; /* if TRUE (which is the default),
que_graph_free() will free us */
};
/* User-supplied function and argument. */

1
include/que0que.h
View file

@ -397,6 +397,7 @@ struct que_fork_struct{
sym_tab_t* sym_tab; /* symbol table of the query,
generated by the parser, or NULL
if the graph was created 'by hand' */
pars_info_t* info; /* in: info struct, or NULL */
/* The following cur_... fields are relevant only in a select graph */
ulint cur_end; /* QUE_CUR_NOT_DEFINED, QUE_CUR_START,

7
pars/pars0pars.c
View file

@ -1875,13 +1875,10 @@ pars_sql(
graph = pars_sym_tab_global->query_graph;
graph->sym_tab = pars_sym_tab_global;
graph->info = info;
/* fprintf(stderr, "SQL graph size %lu\n", mem_heap_get_size(heap)); */
if (info && info->pars_sql_owns_us) {
pars_info_free(info);
}
return(graph);
}
@ -1934,7 +1931,7 @@ pars_info_create(void)
info->heap = heap;
info->funcs = NULL;
info->bound_lits = NULL;
info->pars_sql_owns_us = TRUE;
info->graph_owns_us = TRUE;
return(info);
}

5
que/que0que.c
View file

@ -172,6 +172,7 @@ que_fork_create(
UT_LIST_INIT(fork->thrs);
fork->sym_tab = NULL;
fork->info = NULL;
fork->heap = heap;
@ -671,6 +672,10 @@ que_graph_free(
sym_tab_free_private(graph->sym_tab);
}
if (graph->info && graph->info->graph_owns_us) {
pars_info_free(graph->info);
}
que_graph_free_recursive(graph);
mem_heap_free(graph->heap);