=== 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 21:32:47 +0000
@@ -797,11 +797,11 @@
 				       "$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/ndbapi/NdbIndexScanOperation.hpp'
--- a/storage/ndb/include/ndbapi/NdbIndexScanOperation.hpp	2008-08-26 14:05:01 +0000
+++ b/storage/ndb/include/ndbapi/NdbIndexScanOperation.hpp	2008-08-26 21:32:47 +0000
@@ -245,6 +245,7 @@
   /* 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 @@
     char* key;
   };
 
+private:
   struct OldApiScanRangeDefinition
   {
     /* OldApiBoundInfo used during definition

=== modified file 'storage/ndb/include/transporter/TransporterDefinitions.hpp'
--- a/storage/ndb/include/transporter/TransporterDefinitions.hpp	2008-08-26 14:05:01 +0000
+++ b/storage/ndb/include/transporter/TransporterDefinitions.hpp	2008-08-26 21:32:47 +0000
@@ -44,6 +44,9 @@
  * Maximum message sizes
  * ---------------------
  * Maximum byte sizes for sent and received messages.
+ * The maximum send message size is temporarily smaller than 
+ * the maximum receive message size to support online
+ * upgrade
  * Maximum received size increased in :
  *   mysql-5.1-telco-6.3.17 from 16516 bytes to 32768
  * Maximum send size increased in :

=== modified file 'storage/ndb/src/common/transporter/TCP_Transporter.cpp'
--- a/storage/ndb/src/common/transporter/TCP_Transporter.cpp	2008-08-26 14:05:01 +0000
+++ b/storage/ndb/src/common/transporter/TCP_Transporter.cpp	2008-08-26 21:32:47 +0000
@@ -163,7 +163,7 @@
 	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-23 20:29:50 +0000
+++ b/storage/ndb/test/run-test/atrt-backtrace.sh	2008-08-25 07:57:58 +0000
@@ -38,11 +38,12 @@
 
 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`" ]
-    exe=`which exe`
-    echo "*** $core" >> $out
+then
+    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"