Commit fe46667a authored by unknown's avatar unknown
Browse files

don't cast LEX_STRING to char* :)

parent 8b244fc6

sql/item_func.cc

+4 −4
Original line number Diff line number Diff line
@@ -3543,7 +3543,7 @@ Item_func_sp::execute(Item **itp) 
    m_sp= sp_find_function(thd, m_name);

  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);

  }
@@ -3577,7 +3577,7 @@ Item_func_sp::field_type() const 
    DBUG_PRINT("info", ("m_returns = %d", 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);

}
@@ -3593,7 +3593,7 @@ Item_func_sp::result_type() const 
  {

    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);

}
@@ -3606,7 +3606,7 @@ Item_func_sp::fix_length_and_dec() 
    m_sp= sp_find_function(current_thd, m_name);

  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

  {