Commit 6b428e85 authored by unknown's avatar unknown
Browse files

Merge bk@192.168.21.1:mysql-5.0-opt 

into  mysql.com:/home/hf/work/mrg/mysql-5.0-opt
parents c6ab94bd 173dc70d

configure.in

+2 −2
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ AC_INIT(sql/mysqld.cc) 
AC_CANONICAL_SYSTEM

# The Docs Makefile.am parses this line!

# remember to also change ndb version below and update version.c in ndb

AM_INIT_AUTOMAKE(mysql, 5.0.38)

AM_INIT_AUTOMAKE(mysql, 5.0.40)

AM_CONFIG_HEADER(config.h)



PROTOCOL_VERSION=10
@@ -23,7 +23,7 @@ NDB_SHARED_LIB_VERSION=$NDB_SHARED_LIB_MAJOR_VERSION:0:0 
# ndb version

NDB_VERSION_MAJOR=5

NDB_VERSION_MINOR=0

NDB_VERSION_BUILD=38

NDB_VERSION_BUILD=40

NDB_VERSION_STATUS=""



# Set all version vars based on $VERSION. How do we do this more elegant ?

sql/mysqld.cc

+6 −0
Original line number Diff line number Diff line
@@ -1681,6 +1681,12 @@ void end_thread(THD *thd, bool put_in_cache) 
      thd->real_id=pthread_self();

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

      pthread_mutex_unlock(&LOCK_thread_count);

sql/sp_head.cc

+1 −0
Original line number Diff line number Diff line
@@ -1087,6 +1087,7 @@ sp_head::execute(THD *thd) 
	ctx->enter_handler(hip);

        thd->clear_error();

	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
@@ -1604,7 +1604,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;

  /*