bk commit into 5.1 tree (jonas:1.1971)

[jonas]

Below is the list of changes that have just been committed into a local
5.1 repository of jonas. When jonas 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
  1.1971 05/12/15 15:11:42 jonas@stripped +6 -0
  Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-release
  into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new

  sql/ha_ndbcluster.cc
    1.223 05/12/15 15:11:39 jonas@stripped +0 -20
    merge

  mysql-test/t/ndb_multi.test
    1.7 05/12/15 15:11:39 jonas@stripped +1 -1
    merge

  mysql-test/r/ndb_multi.result
    1.6 05/12/15 15:11:39 jonas@stripped +1 -1
    merge

  sql/sql_class.cc
    1.225 05/12/15 15:08:28 jonas@stripped +0 -0
    Auto merged

  mysql-test/t/ndb_basic.test
    1.35 05/12/15 15:08:28 jonas@stripped +0 -11
    Auto merged

  mysql-test/r/ndb_basic.result
    1.34 05/12/15 15:08:28 jonas@stripped +0 -16
    Auto merged

# 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:	jonas
# Host:	perch.ndb.mysql.com
# Root:	/home/jonas/src/mysql-5.1-new/RESYNC

--- 1.224/sql/sql_class.cc	2005-12-12 20:55:12 +01:00
+++ 1.225/sql/sql_class.cc	2005-12-15 15:08:28 +01:00
@@ -473,10 +473,12 @@
 
   killed= state_to_set;
   if (state_to_set != THD::KILL_QUERY)
+  {
     thr_alarm_kill(real_id);
 #ifdef SIGNAL_WITH_VIO_CLOSE
-  close_active_vio();
+    close_active_vio();
 #endif    
+  }
   if (mysys_var)
   {
     pthread_mutex_lock(&mysys_var->mutex);

--- 1.222/sql/ha_ndbcluster.cc	2005-12-14 14:00:05 +01:00
+++ 1.223/sql/ha_ndbcluster.cc	2005-12-15 15:11:39 +01:00
@@ -3014,7 +3014,6 @@
         }      
         *buff++= 0;
       }
-
       size_t len = key_part->length;
       const byte * ptr = record + key_part->offset;
       Field *field = key_part->field;

--- 1.5/mysql-test/r/ndb_multi.result	2005-11-06 00:20:22 +01:00
+++ 1.6/mysql-test/r/ndb_multi.result	2005-12-15 15:11:39 +01:00
@@ -35,6 +35,7 @@
 Error	1296	Got error 241 'Invalid schema object version' from NDB
 Error	1412	Table definition has changed, please retry transaction
 Error	1105	Unknown error
+flush table t1;
 select * from t1;
 a
 2

--- 1.6/mysql-test/t/ndb_multi.test	2005-11-06 00:20:22 +01:00
+++ 1.7/mysql-test/t/ndb_multi.test	2005-12-15 15:11:39 +01:00
@@ -41,6 +41,7 @@
 --error 1412
 select * from t1;
 show warnings;
+flush table t1;
 select * from t1;
 
 # Connect to server2 and use the tables from there