Commit 3bd46ad8 authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-5.0 

into neptunus.(none):/home/msvensson/mysql/bug9626
parents f87f0450 50bb2039

mysys/thr_alarm.c

+1 −0
Original line number Diff line number Diff line
@@ -85,6 +85,7 @@ void init_thr_alarm(uint max_alarms) 
#else

  {

    struct sigaction sact;

    sact.sa_flags = 0;

    bzero((char*) &sact, sizeof(sact));

    sact.sa_handler = thread_alarm;

    sigaction(THR_CLIENT_ALARM, &sact, (struct sigaction*) 0);

ndb/include/kernel/ndb_limits.h

+3 −1
Original line number Diff line number Diff line
@@ -17,6 +17,8 @@ 
#ifndef NDB_LIMITS_H

#define NDB_LIMITS_H



#include <mysql.h>



#define RNIL    0xffffff00



/**
@@ -52,7 +54,7 @@ 
#define MAX_TUPLES_BITS 13 		/* 13 bits = 8191 tuples per page */

#define MAX_TABLES 20320                /* SchemaFile.hpp */

#define MAX_TAB_NAME_SIZE 128

#define MAX_ATTR_NAME_SIZE 32

#define MAX_ATTR_NAME_SIZE NAME_LEN       /* From mysql_com.h */

#define MAX_ATTR_DEFAULT_VALUE_SIZE 128

#define MAX_ATTRIBUTES_IN_TABLE 128

#define MAX_ATTRIBUTES_IN_INDEX 32

ndb/include/kernel/signaldata/GetTabInfo.hpp

+12 −20
Original line number Diff line number Diff line
@@ -39,22 +39,15 @@ class GetTabInfoReq { 
  friend bool printGET_TABINFO_REQ(FILE *, const Uint32 *, Uint32, Uint16);  

public:

  STATIC_CONST( SignalLength = 5 );

  //  STATIC_CONST( MaxTableNameLengthInWords = 20 );

public:

  Uint32 senderData;

  Uint32 senderRef;



  /**

   * 0 = request by id, 1 = request by name

   */

  Uint32 requestType; 

  

  Uint32 requestType; // Bitmask of GetTabInfoReq::RequestType

  union {

    Uint32 tableId;

    Uint32 tableNameLen;

  };

  Uint32 unused; // This is located here so that Req & Ref have the same format

  //  Uint32 tableName[MaxTableNameLengthInWords];



  enum RequestType {

    RequestById = 0,
@@ -79,11 +72,10 @@ class GetTabInfoRef { 
  friend bool printGET_TABINFO_REF(FILE *, const Uint32 *, Uint32, Uint16);    

public:

  STATIC_CONST( SignalLength = 5 );

  

public:

  Uint32 senderData;

  Uint32 senderRef;

  Uint32 requestType; // 0 = request by id, 1 = request by name

  Uint32 requestType; // Bitmask of GetTabInfoReq::RequestType

  union {

    Uint32 tableId;

    Uint32 tableNameLen;

ndb/include/ndbapi/Ndb.hpp

+1 −10
Original line number Diff line number Diff line
@@ -999,10 +999,6 @@ typedef void (* NdbEventCallback)(NdbEventOperation*, Ndb*, void*); 
#define WAITFOR_RESPONSE_TIMEOUT 120000 // Milliseconds

#endif



#define NDB_MAX_INTERNAL_TABLE_LENGTH NDB_MAX_DATABASE_NAME_SIZE + \

                                      NDB_MAX_SCHEMA_NAME_SIZE + \

                                      NDB_MAX_TAB_NAME_SIZE*2



/**

 * @class Ndb 

 * @brief Represents the NDB kernel and is the main class of the NDB API.
@@ -1626,12 +1622,7 @@ private: 


  bool fullyQualifiedNames;



  // Ndb database name.

  char                  theDataBase[NDB_MAX_DATABASE_NAME_SIZE];

  // Ndb database schema name.  

  char                  theDataBaseSchema[NDB_MAX_SCHEMA_NAME_SIZE];

  char                  prefixName[NDB_MAX_INTERNAL_TABLE_LENGTH];

  char *                prefixEnd;		





  class NdbImpl * theImpl;

  class NdbDictionaryImpl* theDictionary;

ndb/include/ndbapi/ndbapi_limits.h

+0 −4
Original line number Diff line number Diff line
@@ -19,10 +19,6 @@ 


#define NDB_MAX_NO_OF_ATTRIBUTES_IN_KEY 32

#define NDB_MAX_ATTRIBUTES_IN_INDEX NDB_MAX_NO_OF_ATTRIBUTES_IN_KEY

#define NDB_MAX_DATABASE_NAME_SIZE 128

#define NDB_MAX_SCHEMA_NAME_SIZE 128

#define NDB_MAX_TAB_NAME_SIZE 128

#define NDB_MAX_ATTR_NAME_SIZE 32

#define NDB_MAX_ATTRIBUTES_IN_TABLE 128



#define NDB_MAX_TUPLE_SIZE_IN_WORDS 2013