#At file:///home/jonas/src/telco-6.4/
2874 Jonas Oreland 2008-10-02
ndb-win - cleanup asyncgenerator to get it to compile on windows
modified:
storage/ndb/test/ndbapi/bench/asyncGenerator.cpp
storage/ndb/test/ndbapi/bench/dbPopulate.cpp
storage/ndb/test/ndbapi/bench/mainPopulate.cpp
storage/ndb/test/ndbapi/bench/testData.h
storage/ndb/test/ndbapi/bench/userInterface.cpp
storage/ndb/test/ndbapi/bench/userInterface.h
=== modified file 'storage/ndb/test/ndbapi/bench/asyncGenerator.cpp'
--- a/storage/ndb/test/ndbapi/bench/asyncGenerator.cpp 2006-12-23 19:20:40 +0000
+++ b/storage/ndb/test/ndbapi/bench/asyncGenerator.cpp 2008-10-02 18:08:43 +0000
@@ -39,7 +39,7 @@
static void getRandomSubscriberNumber(SubscriberNumber number);
static void getRandomServerId(ServerId *serverId);
static void getRandomChangedBy(ChangedBy changedBy);
-static void getRandomChangedTime(ChangedTime changedTime);
+//static void getRandomChangedTime(ChangedTime changedTime);
static void clearTransaction(TransactionDefinition *trans);
static void initGeneratorStatistics(GeneratorStatistics *gen);
@@ -74,7 +74,7 @@ static SequenceValues rollbackDefinition
{0, 0}
};
-static int maxsize = 0;
+static unsigned maxsize = 0;
/***************************************************************
* P U B L I C D A T A *
@@ -106,11 +106,13 @@ static void getRandomChangedBy(ChangedBy
changedBy[CHANGED_BY_LENGTH] = 0;
}
+#if 0
static void getRandomChangedTime(ChangedTime changedTime)
{
memset(changedTime, myRandom48(26)+'A', CHANGED_TIME_LENGTH);
changedTime[CHANGED_TIME_LENGTH] = 0;
}
+#endif
static void clearTransaction(TransactionDefinition *trans)
{
=== modified file 'storage/ndb/test/ndbapi/bench/dbPopulate.cpp'
--- a/storage/ndb/test/ndbapi/bench/dbPopulate.cpp 2006-12-23 19:20:40 +0000
+++ b/storage/ndb/test/ndbapi/bench/dbPopulate.cpp 2008-10-02 18:08:43 +0000
@@ -41,7 +41,7 @@ static void getRandomSubscriberData(int
SubscriberNumber number,
SubscriberName name);
-static void populate(char *title,
+static void populate(const char *title,
int count,
void (*func)(UserHandle*,int),
UserHandle *uh);
@@ -82,7 +82,7 @@ static void getRandomSubscriberData(int
memset(name, myRandom48(26)+'A', SUBSCRIBER_NAME_LENGTH);
}
-static void populate(char *title,
+static void populate(const char *title,
int count,
void (*func)(UserHandle*, int),
UserHandle *uh)
=== modified file 'storage/ndb/test/ndbapi/bench/mainPopulate.cpp'
--- a/storage/ndb/test/ndbapi/bench/mainPopulate.cpp 2008-08-21 14:38:31 +0000
+++ b/storage/ndb/test/ndbapi/bench/mainPopulate.cpp 2008-10-02 18:08:43 +0000
@@ -32,10 +32,6 @@ int useTableLogging;
#endif
-static void usage()
-{
-}
-
static
void usage(const char *prog)
{
=== modified file 'storage/ndb/test/ndbapi/bench/testData.h'
--- a/storage/ndb/test/ndbapi/bench/testData.h 2008-09-30 08:18:41 +0000
+++ b/storage/ndb/test/ndbapi/bench/testData.h 2008-10-02 18:08:43 +0000
@@ -121,13 +121,13 @@ typedef struct {
} TransactionData ;
typedef struct {
- const struct NdbRecord* subscriberTableNdbRecord;
- const struct NdbRecord* groupTableNdbRecord;
- const struct NdbRecord* sessionTableNdbRecord;
- const struct NdbInterpretedCode* incrServerReadsProg;
- const struct NdbInterpretedCode* incrServerInsertsProg;
- const struct NdbInterpretedCode* incrServerDeletesProg;
- const struct NdbRecord* serverTableNdbRecord;
+ const class NdbRecord* subscriberTableNdbRecord;
+ const class NdbRecord* groupTableNdbRecord;
+ const class NdbRecord* sessionTableNdbRecord;
+ const class NdbInterpretedCode* incrServerReadsProg;
+ const class NdbInterpretedCode* incrServerInsertsProg;
+ const class NdbInterpretedCode* incrServerDeletesProg;
+ const class NdbRecord* serverTableNdbRecord;
} NdbRecordSharedData ;
typedef struct {
@@ -148,7 +148,7 @@ typedef struct {
RunState runState;
double startTime;
TransactionData transactionData;
- struct Ndb * pNDB;
+ class Ndb * pNDB;
NdbRecordSharedData* ndbRecordSharedData;
bool useCombinedUpdate;
} ThreadData;
=== modified file 'storage/ndb/test/ndbapi/bench/userInterface.cpp'
--- a/storage/ndb/test/ndbapi/bench/userInterface.cpp 2008-08-21 05:06:43 +0000
+++ b/storage/ndb/test/ndbapi/bench/userInterface.cpp 2008-10-02 18:08:43 +0000
@@ -46,7 +46,7 @@
extern int localDbPrepare(UserHandle *uh);
-static int dbCreate(UserHandle *uh);
+//static int dbCreate(UserHandle *uh);
/***************************************************************
* L O C A L D A T A *
@@ -106,7 +106,7 @@ double userGetTimeSync(void)
int
userDbCommit(UserHandle *uh){
if(uh->pCurrTrans != 0){
- int check = uh->pCurrTrans->execute( Commit );
+ /* int check = */ uh->pCurrTrans->execute( Commit );
NdbError err = uh->pCurrTrans->getNdbError();
uh->pNDB->closeTransaction(uh->pCurrTrans);
uh->pCurrTrans = 0;
@@ -560,7 +560,7 @@ static int dbCreate(Ndb * pNdb)
#endif
UserHandle*
-userDbConnect(uint32 createDb, char *dbName)
+userDbConnect(uint32 createDb, const char *dbName)
{
Ndb_cluster_connection *con= new Ndb_cluster_connection();
if(con->connect(12, 5, 1) != 0)
=== modified file 'storage/ndb/test/ndbapi/bench/userInterface.h'
--- a/storage/ndb/test/ndbapi/bench/userInterface.h 2006-12-23 19:20:40 +0000
+++ b/storage/ndb/test/ndbapi/bench/userInterface.h 2008-10-02 18:08:43 +0000
@@ -44,7 +44,7 @@
* P U B L I C F U N C T I O N S *
***************************************************************/
-typedef struct Ndb Ndb;
+class Ndb;
#ifdef __cplusplus
extern "C" {
@@ -98,9 +98,9 @@ extern "C" {
***************************************************************/
typedef struct {
- struct Ndb_cluster_connection* pNCC;
- struct Ndb * pNDB;
- struct NdbTransaction * pCurrTrans;
+ class Ndb_cluster_connection* pNCC;
+ class Ndb * pNDB;
+ class NdbTransaction * pCurrTrans;
} UserHandle;
/***************************************************************
@@ -115,7 +115,7 @@ extern double userGetTimeSync(void);
extern void userCheckpoint(UserHandle *uh);
-extern UserHandle *userDbConnect(uint32 createDb, char *dbName);
+extern UserHandle *userDbConnect(uint32 createDb, const char *dbName);
extern void userDbDisconnect(UserHandle *uh);
extern int userDbInsertServer(UserHandle *uh,
| Thread |
|---|
| • bzr commit into mysql-5.1 branch (jonas:2874) | Jonas Oreland | 2 Oct |
