Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1

into mc05.(none):/space2/tomas/mysql-4.1-ndb-test

4 files changed, 10 insertions, 18 deletions

diff --git a/ndb/include/ndb_global.h b/ndb/include/ndb_global.h
index bd1e4954f14..f871acbc075 100644
--- a/ndb/include/ndb_global.h
+++ b/ndb/include/ndb_global.h
@@ -25,7 +25,13 @@
 #endif
 #include <sys/param.h>
 #ifdef HAVE_SYS_STAT_H
-#include <sys/stat.h>
+  #if defined(__cplusplus) && defined(_APP32_64BIT_OFF_T) && defined(_INCLUDE_AES_SOURCE)
+    #undef _INCLUDE_AES_SOURCE
+    #include <sys/stat.h>
+    #define _INCLUDE_AES_SOURCE
+  #else
+    #include <sys/stat.h>
+  #endif
 #endif
 #include <sys/resource.h>
 #ifdef HAVE_SYS_WAIT_H
diff --git a/ndb/include/ndb_types.h b/ndb/include/ndb_types.h
index 5e7b952cfc5..87ebd3d6c6b 100644
--- a/ndb/include/ndb_types.h
+++ b/ndb/include/ndb_types.h
@@ -33,7 +33,7 @@ typedef unsigned int UintR;
 #ifdef __SIZE_TYPE__
 typedef __SIZE_TYPE__ UintPtr;
 #else
-#include <my_config.h>
+#include <my_global.h>
 #ifdef HAVE_STDINT_H
 #include <stdint.h>
 #endif
diff --git a/ndb/include/util/BaseString.hpp b/ndb/include/util/BaseString.hpp
index 75a1c291594..8755c13e9bb 100644
--- a/ndb/include/util/BaseString.hpp
+++ b/ndb/include/util/BaseString.hpp
@@ -203,13 +203,13 @@ BaseString::empty() const
 inline void
 BaseString::ndb_toupper() {
   for(unsigned i = 0; i < length(); i++)
-    m_chr[i] = ::toupper(m_chr[i]);
+    m_chr[i] = toupper(m_chr[i]);
 }
 
 inline void
 BaseString::ndb_tolower() {
   for(unsigned i = 0; i < length(); i++)
-    m_chr[i] = ::tolower(m_chr[i]);
+    m_chr[i] = tolower(m_chr[i]);
 }
 
 inline bool
diff --git a/ndb/include/util/NdbSqlUtil.hpp b/ndb/include/util/NdbSqlUtil.hpp
index dae12bd11a0..841da513d4a 100644
--- a/ndb/include/util/NdbSqlUtil.hpp
+++ b/ndb/include/util/NdbSqlUtil.hpp
@@ -150,7 +150,6 @@ NdbSqlUtil::cmp(Uint32 typeId, const Uint32* p1, const Uint32* p2, Uint32 full,
       }
       return CmpUnknown;
     }
-    break;
   case Type::Tinyunsigned:
     {
       if (size >= 1) {
@@ -165,7 +164,6 @@ NdbSqlUtil::cmp(Uint32 typeId, const Uint32* p1, const Uint32* p2, Uint32 full,
       }
       return CmpUnknown;
     }
-    break;
   case Type::Smallint:
     {
       if (size >= 1) {
@@ -180,7 +178,6 @@ NdbSqlUtil::cmp(Uint32 typeId, const Uint32* p1, const Uint32* p2, Uint32 full,
       }
       return CmpUnknown;
     }
-    break;
   case Type::Smallunsigned:
     {
       if (size >= 1) {
@@ -195,7 +192,6 @@ NdbSqlUtil::cmp(Uint32 typeId, const Uint32* p1, const Uint32* p2, Uint32 full,
       }
       return CmpUnknown;
     }
-    break;
   case Type::Mediumint:         // XXX fix these
     break;
   case Type::Mediumunsigned:
@@ -214,7 +210,6 @@ NdbSqlUtil::cmp(Uint32 typeId, const Uint32* p1, const Uint32* p2, Uint32 full,
       }
       return CmpUnknown;
     }
-    break;
   case Type::Unsigned:
     {
       if (size >= 1) {
@@ -229,7 +224,6 @@ NdbSqlUtil::cmp(Uint32 typeId, const Uint32* p1, const Uint32* p2, Uint32 full,
       }
       return CmpUnknown;
     }
-    break;
   case Type::Bigint:
     {
       if (size >= 2) {
@@ -246,7 +240,6 @@ NdbSqlUtil::cmp(Uint32 typeId, const Uint32* p1, const Uint32* p2, Uint32 full,
       }
       return CmpUnknown;
     }
-    break;
   case Type::Bigunsigned:
     {
       if (size >= 2) {
@@ -263,7 +256,6 @@ NdbSqlUtil::cmp(Uint32 typeId, const Uint32* p1, const Uint32* p2, Uint32 full,
       }
       return CmpUnknown;
     }
-    break;
   case Type::Float:
     {
       if (size >= 1) {
@@ -278,7 +270,6 @@ NdbSqlUtil::cmp(Uint32 typeId, const Uint32* p1, const Uint32* p2, Uint32 full,
       }
       return CmpUnknown;
     }
-    break;
   case Type::Double:
     {
       if (size >= 2) {
@@ -295,7 +286,6 @@ NdbSqlUtil::cmp(Uint32 typeId, const Uint32* p1, const Uint32* p2, Uint32 full,
       }
       return CmpUnknown;
     }
-    break;
   case Type::Decimal:
     break;
   case Type::Char:
@@ -310,7 +300,6 @@ NdbSqlUtil::cmp(Uint32 typeId, const Uint32* p1, const Uint32* p2, Uint32 full,
       int k = memcmp(u1.v, u2.v, size << 2);
       return k < 0 ? -1 : k > 0 ? +1 : full == size ? 0 : CmpUnknown;
     }
-    break;
   case Type::Varchar:
     {
       /*
@@ -328,7 +317,6 @@ NdbSqlUtil::cmp(Uint32 typeId, const Uint32* p1, const Uint32* p2, Uint32 full,
       }
       return CmpUnknown;
     }
-    break;
   case Type::Binary:            // XXX fix these
     break;
   case Type::Varbinary:
@@ -352,7 +340,6 @@ NdbSqlUtil::cmp(Uint32 typeId, const Uint32* p1, const Uint32* p2, Uint32 full,
       }
       return CmpUnknown;
     }
-    break;
   case Type::Timespec:          // XXX fix this
     break;
   case Type::Blob:              // XXX fix
@@ -371,7 +358,6 @@ NdbSqlUtil::cmp(Uint32 typeId, const Uint32* p1, const Uint32* p2, Uint32 full,
       }
       return CmpUnknown;
     }
-    break;
   }
   return CmpError;
 }