bzr push into mysql-5.1 branch (jonas:2734 to 2736)

[Jonas Oreland]

 2736 Jonas Oreland	2008-08-26 [merge]
      merge 6.3 to 6.4
modified:
  mysql-test/mysql-test-run.pl

 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

 2734 Jonas Oreland	2008-08-26
      ndb - fix compile error on solaris
modified:
  storage/ndb/include/kernel/signaldata/DictSignal.hpp

=== modified file 'mysql-test/mysql-test-run.pl'
--- a/mysql-test/mysql-test-run.pl	2008-08-10 19:01:25 +0000
+++ b/mysql-test/mysql-test-run.pl	2008-08-26 10:11:03 +0000
@@ -797,11 +797,11 @@ sub command_line_setup () {
 				       "$glob_basedir/bin");
 
   # Look for language files and charsetsdir, use same share
-  $path_share=      mtr_path_exists("$glob_basedir/share/mysql",
-                                    "$glob_basedir/sql/share",
-                                    "$glob_basedir/share");
+  $path_language=   mtr_path_exists("$glob_basedir/share/mysql/english",
+                                    "$glob_basedir/sql/share/english",
+                                    "$glob_basedir/share/english");
 
-  $path_language=      mtr_path_exists("$path_share/english");
+  $path_share= dirname($path_language);
   $path_charsetsdir=   mtr_path_exists("$path_share/charsets");
 
 

=== modified file 'storage/ndb/include/kernel/signaldata/DictSignal.hpp'
--- a/storage/ndb/include/kernel/signaldata/DictSignal.hpp	2008-02-06 20:15:14 +0000
+++ b/storage/ndb/include/kernel/signaldata/DictSignal.hpp	2008-08-26 10:07:49 +0000
@@ -81,7 +81,7 @@ public:
      * in a later start phase (for non-logged index).  On NR, the build
      * on this node takes place automatically during data copy.
      */
-    RF_NO_BUILD = (1 << 17),
+    RF_NO_BUILD = (1 << 17)
 
   };
 

=== 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"