bzr commit into mysql-5.1 branch (jonas:2735)

[Jonas Oreland]

#At file:///home/jonas/src/telco-6.4/

 2735 Jonas Oreland	2008-08-26 [merge]
      merge 6.3 to 6.4
modified:
  storage/ndb/include/ndbapi/NdbIndexScanOperation.hpp
  storage/ndb/src/common/transporter/TCP_Transporter.cpp
  storage/ndb/test/run-test/atrt-backtrace.sh

=== modified file 'storage/ndb/include/ndbapi/NdbIndexScanOperation.hpp'
--- a/storage/ndb/include/ndbapi/NdbIndexScanOperation.hpp	2008-08-16 13:51:16 +0000
+++ b/storage/ndb/include/ndbapi/NdbIndexScanOperation.hpp	2008-08-26 10:07:22 +0000
@@ -245,6 +245,7 @@ private:
   /* Structure used to collect information about an IndexBound
    * as it is provided by the old Api setBound() calls
    */
+public:
   struct OldApiBoundInfo
   {
     Uint32 highestKey;
@@ -253,6 +254,7 @@ private:
     char* key;
   };
 
+private:
   struct OldApiScanRangeDefinition
   {
     /* OldApiBoundInfo used during definition

=== modified file 'storage/ndb/src/common/transporter/TCP_Transporter.cpp'
--- a/storage/ndb/src/common/transporter/TCP_Transporter.cpp	2008-05-29 15:06:11 +0000
+++ b/storage/ndb/src/common/transporter/TCP_Transporter.cpp	2008-08-26 10:09:35 +0000
@@ -163,7 +163,7 @@ set_get(NDB_SOCKET_TYPE fd, int level, i
 	int val)
 {
   int actual = 0, defval = 0;
-  socklen_t len = sizeof(actual);
+  SOCKET_SIZE_TYPE len = sizeof(actual);
 
   getsockopt(fd, level, optval, (char*)&defval, &len);
   

=== modified file 'storage/ndb/test/run-test/atrt-backtrace.sh'
--- a/storage/ndb/test/run-test/atrt-backtrace.sh	2008-08-24 21:49:05 +0000
+++ b/storage/ndb/test/run-test/atrt-backtrace.sh	2008-08-25 07:57:58 +0000
@@ -38,12 +38,12 @@ rm -f $tmp
 
 if [ -x $exe ]
 then
-    echo "*** $core" >> $out
+    echo "*** $exe - $core" >> $out
     eval "gdb -q -batch -x bt.gdb -c $core $exe $outarg"
 elif [ -x "`which $exe 2> /dev/null`" ]
 then
-    exe=`which exe`
-    echo "*** $core" >> $out
+    exe=`which $exe`
+    echo "*** $exe - $core" >> $out
     eval "gdb -q -batch -x bt.gdb -c $core $exe $outarg"
 else
     eval "echo \"*** $core : cant find exe: $exe\" $outarg"