Commit eeb6c9a9 authored by unknown's avatar unknown
Browse files

ndb - wl-2451: Increase max schema object to > 1600 


mysql-test/Makefile.am:
  divide schemafile in blocks to allow unlimited # objects
ndb/include/debugger/SignalLoggerManager.hpp:
  divide schemafile in blocks to allow unlimited # objects
ndb/include/kernel/ndb_limits.h:
  divide schemafile in blocks to allow unlimited # objects
ndb/src/common/debugger/SignalLoggerManager.cpp:
  divide schemafile in blocks to allow unlimited # objects
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  divide schemafile in blocks to allow unlimited # objects
ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  divide schemafile in blocks to allow unlimited # objects
ndb/src/kernel/blocks/dbdict/SchemaFile.hpp:
  divide schemafile in blocks to allow unlimited # objects
ndb/src/kernel/blocks/dbdict/printSchemaFile.cpp:
  divide schemafile in blocks to allow unlimited # objects
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  divide schemafile in blocks to allow unlimited # objects
ndb/test/ndbapi/testDict.cpp:
  divide schemafile in blocks to allow unlimited # objects
parent b395f235

mysql-test/Makefile.am

+3 −0
Original line number Diff line number Diff line
@@ -59,6 +59,9 @@ dist-hook: 
	$(INSTALL_DATA) $(srcdir)/std_data/*.frm $(distdir)/std_data



install-data-local:

	true



x-install-data-local:

	$(mkinstalldirs) \

		$(DESTDIR)$(testdir)/t \

		$(DESTDIR)$(testdir)/r \

ndb/include/debugger/SignalLoggerManager.hpp

+1 −1
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ public: 
  /**

   * Generic messages in the signal log

   */

  void log(BlockNumber bno, const char * msg);

  void log(BlockNumber bno, const char * msg, ...);

  

  /**

   * LogModes

ndb/include/kernel/ndb_limits.h

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ 
 **/

#define MAX_TUPLES_PER_PAGE 8191

#define MAX_TUPLES_BITS 13 		/* 13 bits = 8191 tuples per page */

#define MAX_TABLES 1600

#define MAX_TABLES 20320                /* SchemaFile.hpp */

#define MAX_TAB_NAME_SIZE 128

#define MAX_ATTR_NAME_SIZE 32

#define MAX_ATTR_DEFAULT_VALUE_SIZE 128

ndb/src/common/debugger/SignalLoggerManager.cpp

+7 −2
Original line number Diff line number Diff line
@@ -383,7 +383,7 @@ SignalLoggerManager::sendSignalWithDelay(Uint32 delayInMilliSeconds, 
 * Generic messages in the signal log

 */

void

SignalLoggerManager::log(BlockNumber bno, const char * msg)

SignalLoggerManager::log(BlockNumber bno, const char * msg, ...)

{

  // Normalise blocknumber for use in logModes array

  const BlockNumber bno2 = bno - MIN_BLOCK_NO;
@@ -391,7 +391,12 @@ SignalLoggerManager::log(BlockNumber bno, const char * msg) 


  if(outputStream != 0 &&

     logModes[bno2] != LogOff){

    fprintf(outputStream, "%s: %s\n", getBlockName(bno, "API"), msg);

    va_list ap;

    va_start(ap, msg);

    fprintf(outputStream, "%s: ", getBlockName(bno, "API"));

    vfprintf(outputStream, msg, ap);

    fprintf(outputStream, "\n", msg);

    va_end(ap);

  }

}

ndb/src/kernel/blocks/dbdict/Dbdict.cpp

+313 −115

File changed.

Preview size limit exceeded, changes collapsed.