summaryrefslogtreecommitdiff
path: root/storage
diff options
context:
space:
mode:
authorDavi Arnaut <Davi.Arnaut@Sun.COM>2009-11-19 21:48:08 -0200
committerDavi Arnaut <Davi.Arnaut@Sun.COM>2009-11-19 21:48:08 -0200
commit5aeeaaf507ac87f6ff56806fe8a356cea7d4a48f (patch)
treed21225ac09b301f317ca89093128769a5ede9fbb /storage
parent780871d8b90fe3146db39b4be65ebedb309b9f9b (diff)
parent5128b54c38ae183d18a29e00b318c22046445715 (diff)
downloadmariadb-git-5aeeaaf507ac87f6ff56806fe8a356cea7d4a48f.tar.gz
Manual merge of mysql-next-mr-runtime upstream.
Diffstat (limited to 'storage')
-rw-r--r--storage/ndb/include/kernel/signaldata/DictTabInfo.hpp4
1 files changed, 0 insertions, 4 deletions
diff --git a/storage/ndb/include/kernel/signaldata/DictTabInfo.hpp b/storage/ndb/include/kernel/signaldata/DictTabInfo.hpp
index 3923d8e6fbf..43de91b7c22 100644
--- a/storage/ndb/include/kernel/signaldata/DictTabInfo.hpp
+++ b/storage/ndb/include/kernel/signaldata/DictTabInfo.hpp
@@ -30,10 +30,6 @@
#define DECIMAL_MAX_LENGTH ((8 * 9) - 8)
-#ifndef NOT_FIXED_DEC
-#define NOT_FIXED_DEC 31
-#endif
-
C_MODE_START
extern int decimal_bin_size(int, int);
C_MODE_END