ndb - post-merge fixes

ndb/include/ndb_constants.h:
  post-merge fixes
ndb/include/ndbapi/NdbDictionary.hpp:
  post-merge fixes
ndb/src/common/util/NdbSqlUtil.cpp:
  post-merge fixes
ndb/test/src/HugoCalculator.cpp:
  post-merge fixes

ndb/include/ndb_constants.h

@@ -48,7 +48,7 @@
 #define NDB_TYPE_BIGUNSIGNED            10
 #define NDB_TYPE_FLOAT                  11
 #define NDB_TYPE_DOUBLE                 12
-#define NDB_TYPE_DECIMAL                13      /* not used */
+#define NDB_TYPE_OLDDECIMAL             13
 #define NDB_TYPE_CHAR                   14
 #define NDB_TYPE_VARCHAR                15
 #define NDB_TYPE_BINARY                 16
@@ -63,7 +63,8 @@
 #define NDB_TYPE_TIME                   25
 #define NDB_TYPE_YEAR                   26
 #define NDB_TYPE_TIMESTAMP              27
+#define NDB_TYPE_OLDDECIMALUNSIGNED     28
 
-#define NDB_TYPE_MAX                    28
+#define NDB_TYPE_MAX                    29
  
 #endif

ndb/include/ndbapi/NdbDictionary.hpp

@@ -184,9 +184,8 @@ public:
       Bigunsigned = NDB_TYPE_BIGUNSIGNED,   ///< 64 Bit. 8 byte signed integer, can be used in array
       Float = NDB_TYPE_FLOAT,         ///< 32-bit float. 4 bytes float, can be used in array
       Double = NDB_TYPE_DOUBLE,        ///< 64-bit float. 8 byte float, can be used in array
-      Decimal = NDB_TYPE_DECIMAL,       ///< Precision, Scale are applicable
       Olddecimal = NDB_TYPE_OLDDECIMAL,    ///< MySQL < 5.0 signed decimal,  Precision, Scale
-      Olddecimalunsigned = NDB_TYPE_OLDDECIMAL_UNSIGNED,
+      Olddecimalunsigned = NDB_TYPE_OLDDECIMALUNSIGNED,
       Char = NDB_TYPE_CHAR,          ///< Len. A fixed array of 1-byte chars
       Varchar = NDB_TYPE_VARCHAR,       ///< Length bytes: 1, Max: 255
       Binary = NDB_TYPE_BINARY,        ///< Len

ndb/src/common/util/NdbSqlUtil.cpp

@@ -434,6 +434,7 @@ NdbSqlUtil::cmpDouble(const void* info, const void* p1, unsigned n1, const void*
   return CmpUnknown;
 }
 
+int
 NdbSqlUtil::cmp_olddecimal(const uchar* s1, const uchar* s2, unsigned n)
 {
   int sgn = +1;

ndb/test/src/HugoCalculator.cpp

@@ -145,7 +145,8 @@ HugoCalculator::calcValue(int record,
   case NdbDictionary::Column::Bigunsigned:
   case NdbDictionary::Column::Float:
   case NdbDictionary::Column::Double:
-  case NdbDictionary::Column::Decimal:
+  case NdbDictionary::Column::Olddecimal:
+  case NdbDictionary::Column::Olddecimalunsigned:
   case NdbDictionary::Column::Binary:
   case NdbDictionary::Column::Datetime:
   case NdbDictionary::Column::Time: