Commit 961805e4 authored by unknown's avatar unknown

Changed order or template specializations (to make aCC on hpita2 not assert)


ndb/src/common/util/basestring_vsnprintf.c:
  Removed redundant declaration
ndb/src/ndbapi/NdbDictionary.cpp:
  Add printout of distribution key property
parent c07ff809
...@@ -254,9 +254,9 @@ SignalDataPrintFunctions[] = { ...@@ -254,9 +254,9 @@ SignalDataPrintFunctions[] = {
,{ 0, 0 } ,{ 0, 0 }
}; };
template class Bitmask<1>;
template class Bitmask<2>;
template class Bitmask<4>;
template struct BitmaskPOD<1>; template struct BitmaskPOD<1>;
template struct BitmaskPOD<2>; template struct BitmaskPOD<2>;
template struct BitmaskPOD<4>; template struct BitmaskPOD<4>;
template class Bitmask<1>;
template class Bitmask<2>;
template class Bitmask<4>;
...@@ -40,7 +40,6 @@ basestring_snprintf(char *str, size_t size, const char *format, ...) ...@@ -40,7 +40,6 @@ basestring_snprintf(char *str, size_t size, const char *format, ...)
* Let's hope vsnprintf works anyways * Let's hope vsnprintf works anyways
*/ */
#define BASESTRING_VSNPRINTF_FUNC(a,b,c,d) vsnprintf(a,b,c,d) #define BASESTRING_VSNPRINTF_FUNC(a,b,c,d) vsnprintf(a,b,c,d)
extern int my_vsnprintf(char *str, size_t size, const char *format, va_list ap);
#endif #endif
#ifdef SNPRINTF_RETURN_TRUNC #ifdef SNPRINTF_RETURN_TRUNC
static char basestring_vsnprintf_buf[16*1024]; static char basestring_vsnprintf_buf[16*1024];
......
...@@ -956,6 +956,10 @@ operator<<(NdbOut& out, const NdbDictionary::Column& col) ...@@ -956,6 +956,10 @@ operator<<(NdbOut& out, const NdbDictionary::Column& col)
out << " NOT NULL"; out << " NOT NULL";
else else
out << " NULL"; out << " NULL";
if (col.getDistributionKey())
out << " DISTRIBUTION KEY";
return out; return out;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment