database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

cleunup items of instruction after every instruction execution

Browse Source
This commit is contained in:
bell@sanja.is.com.ua
2004-05-26 14:28:35 +03:00
parent 5e83cf32a6
commit e822f61d76
2 changed files with 29 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
sql/sp_head.cc
View File

@ -406,6 +406,8 @@ sp_head::execute(THD *thd)
break;
DBUG_PRINT("execute", ("Instruction %u", ip));
ret= i->execute(thd, &ip);
if (i->free_list)
cleanup_items(i->free_list);
// Check if an exception has occurred and a handler has been found
// Note: We havo to check even if ret==0, since warnings (and some
// errors don't return a non-zero value.
@ -434,9 +436,11 @@ sp_head::execute(THD *thd)
done:
DBUG_PRINT("info", ("ret=%d killed=%d query_error=%d",
ret, thd->killed, thd->query_error));
if (thd->current_arena)
cleanup_items(thd->current_arena->free_list);
thd->current_arena= 0;
if (thd->killed || thd->query_error || thd->net.report_error)
ret= -1;
/* If the DB has changed, the pointer has changed too, but the
@ -860,6 +864,23 @@ sp_head::show_create_procedure(THD *thd)
DBUG_RETURN(res);
}
/*
Add instruction to SP
SYNOPSIS
sp_head::add_instr()
instr Instruction
*/
void sp_head::add_instr(sp_instr *instr)
{
instr->free_list= m_thd->free_list;
m_thd->free_list= 0;
insert_dynamic(&m_instr, (gptr)&instr);
}
int
sp_head::show_create_function(THD *thd)
{

13
sql/sp_head.h
View File

@ -142,11 +142,8 @@ public:
int
show_create_function(THD *thd);
inline void
add_instr(sp_instr *i)
{
insert_dynamic(&m_instr, (gptr)&i);
}
void
add_instr(sp_instr *instr);
inline uint
instructions()
@ -249,13 +246,15 @@ class sp_instr : public Sql_alloc
public:
Item *free_list; // My Items
// Should give each a name or type code for debugging purposes?
sp_instr(uint ip)
: Sql_alloc(), m_ip(ip)
:Sql_alloc(), free_list(0), m_ip(ip)
{}
virtual ~sp_instr()
{}
{ free_items(free_list); }
// Execute this instrution. '*nextp' will be set to the index of the next
// instruction to execute. (For most instruction this will be the