Skip to content

M
MariaDB
Commit 5a07b871 authored by serg@serg.mylan's avatar serg@serg.mylan
Browse files
Options

don't cast LEX_STRING to char* :)

parent b4600599
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
sql/item_func.cc
View file @ 5a07b871
...@@ -3543,7 +3543,7 @@ Item_func_sp::execute(Item **itp) ...@@ -3543,7 +3543,7 @@ Item_func_sp::execute(Item **itp)
m_sp= sp_find_function(thd, m_name); m_sp= sp_find_function(thd, m_name);
if (! m_sp) if (! m_sp)
{ {
my_error(ER_SP_DOES_NOT_EXIST, MYF(0), "FUNCTION", m_name->m_qname); my_error(ER_SP_DOES_NOT_EXIST, MYF(0), "FUNCTION", m_name->m_qname.str);
DBUG_RETURN(-1); DBUG_RETURN(-1);
} }
...@@ -3577,7 +3577,7 @@ Item_func_sp::field_type() const ...@@ -3577,7 +3577,7 @@ Item_func_sp::field_type() const
DBUG_PRINT("info", ("m_returns = %d", m_sp->m_returns)); DBUG_PRINT("info", ("m_returns = %d", m_sp->m_returns));
DBUG_RETURN(m_sp->m_returns); DBUG_RETURN(m_sp->m_returns);
} }
my_error(ER_SP_DOES_NOT_EXIST, MYF(0), "FUNCTION", m_name->m_qname); my_error(ER_SP_DOES_NOT_EXIST, MYF(0), "FUNCTION", m_name->m_qname.str);
DBUG_RETURN(MYSQL_TYPE_STRING); DBUG_RETURN(MYSQL_TYPE_STRING);
} }
...@@ -3593,7 +3593,7 @@ Item_func_sp::result_type() const ...@@ -3593,7 +3593,7 @@ Item_func_sp::result_type() const
{ {
DBUG_RETURN(m_sp->result()); DBUG_RETURN(m_sp->result());
} }
my_error(ER_SP_DOES_NOT_EXIST, MYF(0), "FUNCTION", m_name->m_qname); my_error(ER_SP_DOES_NOT_EXIST, MYF(0), "FUNCTION", m_name->m_qname.str);
DBUG_RETURN(STRING_RESULT); DBUG_RETURN(STRING_RESULT);
} }
...@@ -3606,7 +3606,7 @@ Item_func_sp::fix_length_and_dec() ...@@ -3606,7 +3606,7 @@ Item_func_sp::fix_length_and_dec()
m_sp= sp_find_function(current_thd, m_name); m_sp= sp_find_function(current_thd, m_name);
if (! m_sp) if (! m_sp)
{ {
my_error(ER_SP_DOES_NOT_EXIST, MYF(0), "FUNCTION", m_name->m_qname); my_error(ER_SP_DOES_NOT_EXIST, MYF(0), "FUNCTION", m_name->m_qname.str);
} }
else else
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7