Commit ce93bc3d authored by tomas@poseidon.mysql.com's avatar tomas@poseidon.mysql.com
Browse files

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-telco-gca 

into  poseidon.mysql.com:/home/tomas/mysql-5.1-telco-gca
parents 13066723 47d5fb91

mysql-test/ndb/ndb_config_2_node.ini

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ TimeBetweenGlobalCheckpoints= 500 
NoOfFragmentLogFiles= 4

FragmentLogFileSize=12M

DiskPageBufferMemory= CHOOSE_DiskPageBufferMemory

ODirect= 1

# the following parametes just function as a small regression

# test that the parameter exists

InitialNoOfOpenFiles= 27

storage/ndb/include/mgmapi/mgmapi_config_parameters.h

+4 −0
Original line number Diff line number Diff line
@@ -82,6 +82,8 @@ 
#define CFG_DB_BACKUP_WRITE_SIZE          136

#define CFG_DB_BACKUP_MAX_WRITE_SIZE      139



#define CFG_DB_WATCHDOG_INTERVAL_INITIAL  141



#define CFG_LOG_DESTINATION           147



#define CFG_DB_DISCLESS               148
@@ -114,6 +116,8 @@ 


#define CFG_DB_MEMREPORT_FREQUENCY    166



#define CFG_DB_O_DIRECT               168



#define CFG_DB_SGA                    198 /* super pool mem */

#define CFG_DB_DATA_MEM_2             199 /* used in special build in 5.1 */

storage/ndb/include/ndb_global.h.in

+2 −0
Original line number Diff line number Diff line
@@ -146,4 +146,6 @@ extern "C" { 
#define MAX(x,y) (((x)>(y))?(x):(y))

#endif



#define NDB_O_DIRECT_WRITE_ALIGNMENT 512



#endif

storage/ndb/include/portlib/NdbTick.h

+0 −4
Original line number Diff line number Diff line
@@ -37,9 +37,6 @@ NDB_TICKS NdbTick_CurrentMillisecond(void); 
 */

int NdbTick_CurrentMicrosecond(NDB_TICKS * secs, Uint32 * micros);



  /*#define TIME_MEASUREMENT*/

#ifdef TIME_MEASUREMENT



struct MicroSecondTimer {

  NDB_TICKS seconds;

  NDB_TICKS micro_seconds;
@@ -54,7 +51,6 @@ struct MicroSecondTimer { 
NDB_TICKS NdbTick_getMicrosPassed(struct MicroSecondTimer start,

                            struct MicroSecondTimer stop);

int NdbTick_getMicroTimer(struct MicroSecondTimer* time_now);

#endif



#ifdef	__cplusplus

}

storage/ndb/src/common/portlib/NdbTick.c

+1 −3
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 




#include <ndb_global.h>

#include "NdbTick.h"

#include <NdbTick.h>



#define NANOSEC_PER_SEC  1000000000

#define MICROSEC_PER_SEC 1000000
@@ -71,7 +71,6 @@ NdbTick_CurrentMicrosecond(NDB_TICKS * secs, Uint32 * micros){ 
}



#endif

#ifdef TIME_MEASUREMENT

int

NdbTick_getMicroTimer(struct MicroSecondTimer* input_timer)

{
@@ -102,4 +101,3 @@ NdbTick_getMicrosPassed(struct MicroSecondTimer start, 
  }

  return ret_value;

}
 
#endif