From 7c9a155c4a08c5bebcc750901186f3edb33023e6 Mon Sep 17 00:00:00 2001
From: "pekka@mysql.com" <>
Date: Wed, 16 Feb 2005 12:45:59 +0100
Subject: ndb - fix old decimal type mysql vs ndb

---
 ndb/test/include/NdbSchemaOp.hpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'ndb/test')

diff --git a/ndb/test/include/NdbSchemaOp.hpp b/ndb/test/include/NdbSchemaOp.hpp
index 77e704c0e5c..e8ab542b00a 100644
--- a/ndb/test/include/NdbSchemaOp.hpp
+++ b/ndb/test/include/NdbSchemaOp.hpp
@@ -567,7 +567,8 @@ convertColumnTypeToAttrType(NdbDictionary::Column::Type _type)
   case NdbDictionary::Column::Unsigned:
     return UnSigned;
   case NdbDictionary::Column::Float:
-  case NdbDictionary::Column::Decimal:
+  case NdbDictionary::Column::Olddecimal:
+  case NdbDictionary::Column::Olddecimalunsigned:
   case NdbDictionary::Column::Double:
     return Float;
   case NdbDictionary::Column::Char:
-- 
cgit v1.2.1


From 51553a5af1fe7257efea7eaa6729df327ff0c83c Mon Sep 17 00:00:00 2001
From: "pekka@mysql.com" <>
Date: Wed, 16 Feb 2005 14:59:17 +0100
Subject: ndb - post-merge fixes

---
 ndb/test/src/HugoCalculator.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'ndb/test')

diff --git a/ndb/test/src/HugoCalculator.cpp b/ndb/test/src/HugoCalculator.cpp
index 44edb34295a..0a5b9c342c8 100644
--- a/ndb/test/src/HugoCalculator.cpp
+++ b/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:
-- 
cgit v1.2.1