mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-02 20:11:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge bk-internal.mysql.com:/home/bk/mysql-5.0

Browse source 
into  mysql.com:/home/my/mysql-5.0
This commit is contained in:
monty@mysql.com 2006-05-04 19:18:26 +03:00
commit ae83d6826d
5 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
sql/item_func.h
View file

@ -284,6 +284,7 @@ class Item_func_connection_id :public Item_int_func
longlong value;
public:
Item_func_connection_id() {}
const char *func_name() const { return "connection_id"; }
void fix_length_and_dec();
bool fix_fields(THD *thd, Item **ref);

2
sql/sp.cc
View file

@ -269,7 +269,6 @@ db_find_routine_aux(THD *thd, int type, sp_name *name, TABLE *table)
static int
db_find_routine(THD *thd, int type, sp_name *name, sp_head **sphp)
{
extern int MYSQLparse(void *thd);
TABLE *table;
const char *params, *returns, *body;
int ret;
@ -478,6 +477,7 @@ db_load_routine(THD *thd, int type, sp_name *name, sp_head **sphp,
(*sphp)->optimize();
}
end:
lex_end(thd->lex);
thd->spcont= old_spcont;
thd->variables.sql_mode= old_sql_mode;
thd->variables.select_limit= old_select_limit;

4
sql/sp_head.cc
View file

@ -671,6 +671,7 @@ sp_head::destroy()
DBUG_ASSERT(m_lex.is_empty() || m_thd);
while ((lex= (LEX *)m_lex.pop()))
{
lex_end(m_thd->lex);
delete m_thd->lex;
m_thd->lex= lex;
}
@ -1643,7 +1644,10 @@ sp_head::restore_lex(THD *thd)
*/
merge_table_list(thd, sublex->query_tables, sublex);
if (! sublex->sp_lex_in_use)
{
lex_end(sublex);
delete sublex;
}
thd->lex= oldlex;
DBUG_VOID_RETURN;
}

3
sql/sp_head.h
View file

@ -520,7 +520,10 @@ public:
virtual ~sp_lex_keeper()
{
if (m_lex_resp)
{
lex_end(m_lex);
delete m_lex;
}
}
/*

1
sql/sql_view.cc
View file

@ -1195,6 +1195,7 @@ ok2:
end:
if (arena)
thd->restore_active_arena(arena, &backup);
lex_end(thd->lex);
thd->lex= old_lex;
DBUG_RETURN(result);