Commit a87ff6cc authored by unknown's avatar unknown
Browse files

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 fb9e01d3

ndb/src/common/debugger/signaldata/SignalDataPrint.cpp

+3 −3
Original line number Diff line number Diff line
@@ -254,9 +254,9 @@ SignalDataPrintFunctions[] = { 
  ,{ 0, 0 }

};



template class Bitmask<1>;

template class Bitmask<2>;

template class Bitmask<4>;

template struct BitmaskPOD<1>;

template struct BitmaskPOD<2>;

template struct BitmaskPOD<4>;

template class Bitmask<1>;

template class Bitmask<2>;

template class Bitmask<4>;

ndb/src/common/util/basestring_vsnprintf.c

+0 −1
Original line number Diff line number Diff line
@@ -40,7 +40,6 @@ basestring_snprintf(char *str, size_t size, const char *format, ...) 
   *  Let's hope vsnprintf works anyways

   */

  #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

#ifdef SNPRINTF_RETURN_TRUNC

static char basestring_vsnprintf_buf[16*1024];

ndb/src/ndbapi/NdbDictionary.cpp

+4 −0
Original line number Diff line number Diff line
@@ -956,6 +956,10 @@ operator<<(NdbOut& out, const NdbDictionary::Column& col) 
    out << " NOT NULL";

  else

    out << " NULL";



  if (col.getDistributionKey())

    out << " DISTRIBUTION KEY";

  

  return out;

}