database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

MDEV-13533 Remove the THD parameter from sp_head::init_sp_name()

Browse Source
This commit is contained in:
Alexander Barkov
2017-08-15 16:41:58 +04:00
parent 3f7f0c6a29
commit b5098f3dae
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/sp_head.cc
View File

@ -610,7 +610,7 @@ sp_head::init(LEX *lex)
void
sp_head::init_sp_name(THD *thd, const sp_name *spname)
sp_head::init_sp_name(const sp_name *spname)
{
DBUG_ENTER("sp_head::init_sp_name");
@ -619,10 +619,10 @@ sp_head::init_sp_name(THD *thd, const sp_name *spname)
DBUG_ASSERT(spname && spname->m_db.str && spname->m_db.length);
/* We have to copy strings to get them into the right memroot. */
Database_qualified_name::copy(mem_root, spname->m_db, spname->m_name);
Database_qualified_name::copy(&main_mem_root, spname->m_db, spname->m_name);
m_explicit_name= spname->m_explicit_name;
spname->make_qname(thd, &m_qname);
spname->make_qname(&main_mem_root, &m_qname);
DBUG_VOID_RETURN;
}

2
sql/sp_head.h
View File

@ -320,7 +320,7 @@ public:
/** Copy sp name from parser. */
void
init_sp_name(THD *thd, const sp_name *spname);
init_sp_name(const sp_name *spname);
/** Set the body-definition start position. */
void

4
sql/sql_class.h
View File

@ -5984,13 +5984,13 @@ public:
(int) m_name.length, m_name.str);
}
// Export db and name as a qualified name string, allocate on mem_root.
bool make_qname(THD *thd, LEX_CSTRING *dst) const
bool make_qname(MEM_ROOT *mem_root, LEX_CSTRING *dst) const
{
const uint dot= !!m_db.length;
char *tmp;
/* format: [database + dot] + name + '\0' */
dst->length= m_db.length + dot + m_name.length;
if (!(dst->str= tmp= (char*) thd->alloc(dst->length + 1)))
if (!(dst->str= tmp= (char*) alloc_root(mem_root, dst->length + 1)))
return true;
sprintf(tmp, "%.*s%.*s%.*s",
(int) m_db.length, (m_db.length ? m_db.str : ""),

2
sql/sql_lex.cc
View File

@ -5845,7 +5845,7 @@ sp_head *LEX::make_sp_head(THD *thd, const sp_name *name,
sp->reset_thd_mem_root(thd);
sp->init(this);
if (name)
sp->init_sp_name(thd, name);
sp->init_sp_name(name);
sphead= sp;
}
sp_chistics.init();