Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-new

into mysql.com:/M51/mysql-5.1

scripts/make_binary_distribution.sh

@@ -308,7 +308,7 @@ fi
 
 # NDB Cluster
 if [ x$NDBCLUSTER = x1 ]; then
-  ( cd ndb            ; @MAKE@ DESTDIR=$BASE/ndb-stage install )
+  ( cd storage/ndb    ; @MAKE@ DESTDIR=$BASE/ndb-stage install )
   ( cd mysql-test/ndb ; @MAKE@ DESTDIR=$BASE/ndb-stage install )
   $CP $BASE/ndb-stage@bindir@/* $BASE/bin/.
   $CP $BASE/ndb-stage@libexecdir@/* $BASE/bin/.

sql/mysqld.cc

@@ -390,6 +390,9 @@ extern ulong srv_commit_concurrency;
 }
 #endif
 #ifdef WITH_BERKELEY_STORAGE_ENGINE
+#ifndef HAVE_U_INT32_T
+typedef unsigned int  u_int32_t;
+#endif
 extern const u_int32_t bdb_DB_TXN_NOSYNC, bdb_DB_RECOVER, bdb_DB_PRIVATE;
 extern bool berkeley_shared_data;
 extern u_int32_t berkeley_init_flags,berkeley_env_flags, berkeley_lock_type,

storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp

@@ -250,6 +250,7 @@ class Dbtup: public SimulatedBlock {
 friend class Suma;
 public:
 struct KeyReqStruct;
+friend struct KeyReqStruct; // CC
 typedef bool (Dbtup::* ReadFunction)(Uint32*,
                                      KeyReqStruct*,
                                      AttributeHeader*,
@@ -2345,14 +2346,15 @@ private:
 //---------------------------------------------------------------
 //
 // Public methods
-  Uint32* alloc_var_rec(Fragrecord*, Tablerec*, Uint32, Local_key*, Uint32*,
-			Uint32 base);
+  Uint32* alloc_var_rec(Fragrecord*const, Tablerec*const, Uint32, Local_key*,
+                        Uint32*, Uint32 base);
   void free_var_part(Fragrecord*, Tablerec*, Var_part_ref, Uint32 chain);
   void free_var_part(Fragrecord*, Tablerec*, Local_key*, Var_page*, Uint32 chain);
   
   void validate_page(Tablerec*, Var_page* page);
   
-  Uint32* alloc_fix_rec(Fragrecord*, Tablerec*, Local_key*, Uint32 *);
+  Uint32* alloc_fix_rec(Fragrecord*const, Tablerec*const, Local_key*,
+                        Uint32*);
   void free_fix_rec(Fragrecord*, Tablerec*, Local_key*, Fix_page*);
   
 // Private methods

storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp

@@ -113,22 +113,25 @@ Dbtup::setUpQueryRoutines(Tablerec* const regTabPtr)
       }
       if(AttributeDescriptor::getDiskBased(attrDescr))
       {
-	ReadFunction r[] = {
-	  &Dbtup::readDiskBitsNotNULL,
-	  &Dbtup::readDiskBitsNULLable,
-	  &Dbtup::readDiskFixedSizeNotNULL,
-	  &Dbtup::readDiskFixedSizeNULLable,
-	  &Dbtup::readDiskVarSizeNULLable,
-	  &Dbtup::readDiskVarSizeNotNULL
-	};
-	UpdateFunction u[] = {
-	  &Dbtup::updateDiskBitsNotNULL,
-	  &Dbtup::updateDiskBitsNULLable,
-	  &Dbtup::updateDiskFixedSizeNotNULL,
-	  &Dbtup::updateDiskFixedSizeNULLable,
-	  &Dbtup::updateDiskVarSizeNULLable,
-	  &Dbtup::updateDiskVarSizeNotNULL
-	};
+        // array initializer crashes gcc-2.95.3
+	ReadFunction r[6];
+        {
+	  r[0] = &Dbtup::readDiskBitsNotNULL;
+	  r[1] = &Dbtup::readDiskBitsNULLable;
+	  r[2] = &Dbtup::readDiskFixedSizeNotNULL;
+	  r[3] = &Dbtup::readDiskFixedSizeNULLable;
+	  r[4] = &Dbtup::readDiskVarSizeNULLable;
+	  r[5] = &Dbtup::readDiskVarSizeNotNULL;
+        }
+	UpdateFunction u[6];
+        {
+	  u[0] = &Dbtup::updateDiskBitsNotNULL;
+	  u[1] = &Dbtup::updateDiskBitsNULLable;
+	  u[2] = &Dbtup::updateDiskFixedSizeNotNULL;
+	  u[3] = &Dbtup::updateDiskFixedSizeNULLable;
+	  u[4] = &Dbtup::updateDiskVarSizeNULLable;
+	  u[5] = &Dbtup::updateDiskVarSizeNotNULL;
+        }
 	Uint32 a= 
 	  AttributeDescriptor::getArrayType(attrDescr) == NDB_ARRAYTYPE_FIXED ? 2 : 4;
 	

storage/ndb/src/kernel/blocks/dbtup/test_varpage.cpp

@@ -123,3 +123,7 @@ main(void)
 }
 
 template class Vector<Record>;
+
+// hp3750
+struct Signal { Signal(); int foo; };
+Signal::Signal(){}

storage/ndb/src/kernel/blocks/pgman.hpp

@@ -243,6 +243,9 @@ public:
 private:
   friend class Page_cache_client;
 
+  struct Page_entry; // CC
+  friend struct Page_entry;
+
   struct Page_request {
     enum Flags {
       OP_MASK       = 0x000F // 4 bits for TUP operation

storage/ndb/src/kernel/blocks/print_file.cpp

@@ -368,3 +368,6 @@ print_undo_page(int count, void* ptr, Uint32 sz){
 
   return 0;
 }
+
+// hp3750
+Signal::Signal(){}

storage/ndb/src/kernel/blocks/restore.hpp

@@ -72,6 +72,9 @@ public:
   };
 private:
 
+  struct File; // CC
+  friend struct File;
+
   struct File 
   {
     File() {}