diff options
| author | tomas@poseidon.ndb.mysql.com <> | 2005-02-16 17:27:58 +0100 |
|---|---|---|
| committer | tomas@poseidon.ndb.mysql.com <> | 2005-02-16 17:27:58 +0100 |
| commit | 27538f49e3ca38d84018bd828e03566c0cfab1b6 (patch) | |
| tree | bfee62a32e60aee4c2b42af34cb46e1a150540a3 /ndb/test | |
| parent | 9920f4eb29ee9c3a1c63b0b37769b80bd23e4288 (diff) | |
| parent | 51553a5af1fe7257efea7eaa6729df327ff0c83c (diff) | |
| download | mariadb-git-27538f49e3ca38d84018bd828e03566c0cfab1b6.tar.gz | |
Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-wl2278
Diffstat (limited to 'ndb/test')
| -rw-r--r-- | ndb/test/include/NdbSchemaOp.hpp | 3 | ||||
| -rw-r--r-- | ndb/test/src/HugoCalculator.cpp | 3 |
2 files changed, 4 insertions, 2 deletions
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: 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: |