Commit 41a7704b authored by unknown's avatar unknown
Browse files

Merge mockturtle.local:/home/dlenev/src/mysql-5.0-bg25966-2 

into  mockturtle.local:/home/dlenev/src/mysql-5.1-bg25966


sql/mysqld.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
parents d139d19a 04e727c7

sql/mysqld.cc

+6 −0
Original line number Diff line number Diff line
@@ -1804,6 +1804,12 @@ static bool cache_thread() 
      thd= thread_cache.get();

      thd->thread_stack= (char*) &thd;          // For store_globals

      (void) thd->store_globals();

      /*

        THD::mysys_var::abort is associated with physical thread rather

        than with THD object. So we need to reset this flag before using

        this thread for handling of new THD object/connection.

      */

      thd->mysys_var->abort= 0;

      thd->thr_create_time= time(NULL);

      threads.append(thd);

      return(1);

sql/sp_head.cc

+1 −0
Original line number Diff line number Diff line
@@ -1127,6 +1127,7 @@ sp_head::execute(THD *thd) 
        thd->clear_error();

        thd->is_fatal_error= 0;

	thd->killed= THD::NOT_KILLED;

        thd->mysys_var->abort= 0;

	continue;

      }

    }

sql/sql_parse.cc

+3 −0
Original line number Diff line number Diff line
@@ -689,7 +689,10 @@ bool dispatch_command(enum enum_server_command command, THD *thd, 
  DBUG_ENTER("dispatch_command");



  if (thd->killed == THD::KILL_QUERY || thd->killed == THD::KILL_BAD_DATA)

  {

    thd->killed= THD::NOT_KILLED;

    thd->mysys_var->abort= 0;

  }



  thd->command=command;

  /*