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

Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime

Browse source 
into  weblab.(none):/home/marcsql/TREE/mysql-5.1-27857
This commit is contained in:
malff/marcsql@weblab.(none) 2007-06-14 15:58:51 -06:00
commit 4466377736
3 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
sql/sp_head.cc
View file

@ -2053,6 +2053,13 @@ sp_head::set_info(longlong created, longlong modified,
}
void
sp_head::set_body_begin_ptr(Lex_input_stream *lip, const char *begin_ptr)
{
m_body_begin= begin_ptr;
}
void
sp_head::set_definer(const char *definer, uint definerlen)
{

5
sql/sp_head.h
View file

@ -178,8 +178,11 @@ public:
// Pointers set during parsing
const char *m_param_begin;
const char *m_param_end;
private:
const char *m_body_begin;
public:
/*
Security context for stored routine which should be run under
definer privileges.
@ -297,6 +300,8 @@ public:
void set_info(longlong created, longlong modified,
st_sp_chistics *chistics, ulong sql_mode);
void set_body_begin_ptr(Lex_input_stream *lip, const char *begin_ptr);
void set_definer(const char *definer, uint definerlen);
void set_definer(const LEX_STRING *user_name, const LEX_STRING *host_name);

8
sql/sql_yacc.yy
View file

@ -1872,7 +1872,7 @@ ev_sql_stmt:
bzero((char *)&lex->sp_chistics, sizeof(st_sp_chistics));
lex->sphead->m_chistics= &lex->sp_chistics;
lex->sphead->m_body_begin= lip->get_cpp_ptr();
lex->sphead->set_body_begin_ptr(lip, lip->get_cpp_ptr());
}
ev_sql_stmt_inner
{
@ -2066,7 +2066,7 @@ create_function_tail:
Lex_input_stream *lip= thd->m_lip;
lex->sphead->m_chistics= &lex->sp_chistics;
lex->sphead->m_body_begin= lip->get_cpp_tok_start();
lex->sphead->set_body_begin_ptr(lip, lip->get_cpp_tok_start());
}
sp_proc_stmt
{
@ -11489,7 +11489,7 @@ trigger_tail:
bzero((char *)&lex->sp_chistics, sizeof(st_sp_chistics));
lex->sphead->m_chistics= &lex->sp_chistics;
lex->sphead->m_body_begin= lip->get_cpp_ptr();
lex->sphead->set_body_begin_ptr(lip, lip->get_cpp_ptr());
}
sp_proc_stmt /* $16 */
{ /* $17 */
@ -11592,7 +11592,7 @@ sp_tail:
Lex_input_stream *lip= thd->m_lip;
lex->sphead->m_chistics= &lex->sp_chistics;
lex->sphead->m_body_begin= lip->get_cpp_tok_start();
lex->sphead->set_body_begin_ptr(lip, lip->get_cpp_tok_start());
}
sp_proc_stmt
{