MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:dlenev Date:March 15 2007 8:55am
Subject:bk commit into 5.1 tree (dlenev:1.2492)
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of dlenev. When dlenev does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-03-15 11:55:15+03:00, dlenev@stripped +3 -0
  Merge mockturtle.local:/home/dlenev/src/mysql-5.0-bg25966-2
  into  mockturtle.local:/home/dlenev/src/mysql-5.1-bg25966
  MERGE: 1.1810.2672.2

  sql/mysqld.cc@stripped, 2007-03-15 11:55:11+03:00, dlenev@stripped +0 -0
    Auto merged
    MERGE: 1.439.1.159

  sql/sp_head.cc@stripped, 2007-03-15 11:55:11+03:00, dlenev@stripped +0 -0
    Auto merged
    MERGE: 1.200.7.13

  sql/sql_parse.cc@stripped, 2007-03-15 11:55:11+03:00, dlenev@stripped +0 -0
    Auto merged
    MERGE: 1.426.1.185

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	dlenev
# Host:	mockturtle.local
# Root:	/home/dlenev/src/mysql-5.1-bg25966/RESYNC

--- 1.619/sql/mysqld.cc	2007-03-15 11:55:24 +03:00
+++ 1.620/sql/mysqld.cc	2007-03-15 11:55:24 +03:00
@@ -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);

--- 1.642/sql/sql_parse.cc	2007-03-15 11:55:25 +03:00
+++ 1.643/sql/sql_parse.cc	2007-03-15 11:55:25 +03:00
@@ -689,7 +689,10 @@ bool dispatch_command(enum enum_server_c
   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;
   /*

--- 1.258/sql/sp_head.cc	2007-03-15 11:55:25 +03:00
+++ 1.259/sql/sp_head.cc	2007-03-15 11:55:25 +03:00
@@ -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;
       }
     }
Thread
bk commit into 5.1 tree (dlenev:1.2492)dlenev15 Mar