Commit aa4da5f7 authored by unknown's avatar unknown
Browse files

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

into serg.mylan:/usr/home/serg/Abk/mysql-5.0
parents 12826df8 056d7266

sql/sql_class.cc

+1 −1
Original line number Diff line number Diff line
@@ -1498,7 +1498,7 @@ int select_dumpvar::prepare(List<Item> &list, SELECT_LEX_UNIT *u) 
    {

      Item_splocal *var;

      (void)local_vars.push_back(var= new Item_splocal(mv->s, mv->offset));

#ifndef DEBUG_OFF

#ifndef DBUG_OFF

      var->owner= mv->owner;

#endif

    }

sql/sql_class.h

+1 −1
Original line number Diff line number Diff line
@@ -2086,7 +2086,7 @@ class multi_update :public select_result_interceptor 
class my_var : public Sql_alloc  {

public:

  LEX_STRING s;

#ifndef DEBUG_OFF

#ifndef DBUG_OFF

  /*

    Routine to which this Item_splocal belongs. Used for checking if correct

    runtime context is used for variable handling.

sql/sql_yacc.yy

+3 −3
Original line number Diff line number Diff line
@@ -2288,7 +2288,7 @@ sp_case: 
	      ivar.length= 5;

	      Item_splocal *var= new Item_splocal(ivar,

                                                  ctx->current_pvars()-1);

#ifndef DEBUG_OFF

#ifndef DBUG_OFF

              if (var)

                var->owner= sp;

#endif
@@ -5875,7 +5875,7 @@ select_var_ident: 
               my_var *var;

	       ((select_dumpvar *)lex->result)->

                 var_list.push_back(var= new my_var($1,1,t->offset,t->type));

#ifndef DEBUG_OFF

#ifndef DBUG_OFF

	       if (var)

		 var->owner= lex->sphead;

#endif
@@ -7181,7 +7181,7 @@ simple_ident: 
            Item_splocal *splocal;

            splocal= new Item_splocal($1, spv->offset, lex->tok_start_prev - 

                                      lex->sphead->m_tmp_query);

#ifndef DEBUG_OFF

#ifndef DBUG_OFF

            if (splocal)

              splocal->owner= lex->sphead;

#endif