Commit 94964da3 authored by unknown's avatar unknown
Browse files

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

into  mysql.com:/home/my/mysql-5.0
parents 8570020c 8f1ed0aa

sql/item_func.h

+1 −0
Original line number Diff line number Diff line
@@ -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);

sql/sp.cc

+1 −1
Original line number Diff line number Diff line
@@ -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;

sql/sp_head.cc

+4 −0
Original line number Diff line number Diff line
@@ -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;

}

sql/sp_head.h

+3 −0
Original line number Diff line number Diff line
@@ -520,8 +520,11 @@ class sp_lex_keeper 
  virtual ~sp_lex_keeper()

  {

    if (m_lex_resp)

    {

      lex_end(m_lex);

      delete m_lex;

    }

  }



  /*

    Prepare execution of instruction using LEX, if requested check whenever

sql/sql_view.cc

+1 −0
Original line number Diff line number Diff line
@@ -1195,6 +1195,7 @@ bool mysql_make_view(THD *thd, File_parser *parser, TABLE_LIST *table) 
end:

  if (arena)

    thd->restore_active_arena(arena, &backup);

  lex_end(thd->lex);

  thd->lex= old_lex;

  DBUG_RETURN(result);