Skip to content

Commit add30d5

Browse files
author
Ole John Aske
committed
Fix for bug#18068206 COMPILER WARNING: "ERR" REDEFINED
 On Solaris platforms the definition of 'ERR' in NDBT_Error.hpp redefined 'ERR' which was defined in the include file /usr/include/sys/regset.h This patch rename *ERR to NDB_*ERR to remove that name clash. NOTE: No functional changes, only a pure rename.
1 parent 50e71ab commit add30d5

40 files changed

+734
-734
lines changed

‎storage/ndb/test/include/NDBT_Error.hpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ class ErrorData {
8282
// ERR prints an NdbError object together with a description of where the
8383
// error occured
8484
//
85-
#define ERR_OUT(where, error) \
85+
#define NDB_ERR_OUT(where, error) \
8686
{ where << "ERROR: " << error.code << " " \
8787
<< error.message << endl \
8888
<< " " << "Status: " << error.status \
@@ -92,11 +92,11 @@ class ErrorData {
9292
; \
9393
}
9494

95-
#define ERR(error) \
95+
#define NDB_ERR(error) \
9696
{ \
9797
const NdbError &_error= (error); \
98-
ERR_OUT(g_err, _error); \
98+
NDB_ERR_OUT(g_err, _error); \
9999
}
100-
#define ERR_INFO(error) ERR_OUT(g_info, error)
100+
#define NDB_ERR_INFO(error) NDB_ERR_OUT(g_info, error)
101101

102102
#endif

‎storage/ndb/test/ndbapi/ScanFunctions.hpp

+11-11
Original file line numberDiff line numberDiff line change
@@ -94,27 +94,27 @@ ScanFunctions::scanReadFunctions(Ndb* pNdb,
9494
if (pTrans == NULL) {
9595
const NdbError err = pNdb->getNdbError();
9696
if (err.status == NdbError::TemporaryError){
97-
ERR(err);
97+
NDB_ERR(err);
9898
NdbSleep_MilliSleep(50);
9999
retryAttempt++;
100100
continue;
101101
}
102-
ERR(err);
102+
NDB_ERR(err);
103103
return NDBT_FAILED;
104104
}
105105

106106
// Execute the scan without defining a scan operation
107107
pOp = pTrans->getNdbScanOperation(tab.getName());
108108
if (pOp == NULL) {
109-
ERR(pTrans->getNdbError());
109+
NDB_ERR(pTrans->getNdbError());
110110
pNdb->closeTransaction(pTrans);
111111
return NDBT_FAILED;
112112
}
113113

114114
if( pOp->readTuples(exclusive ?
115115
NdbScanOperation::LM_Exclusive :
116116
NdbScanOperation::LM_Read) ) {
117-
ERR(pTrans->getNdbError());
117+
NDB_ERR(pTrans->getNdbError());
118118
pNdb->closeTransaction(pTrans);
119119
return NDBT_FAILED;
120120
}
@@ -123,7 +123,7 @@ ScanFunctions::scanReadFunctions(Ndb* pNdb,
123123
if (action == OnlyOpenScanOnce){
124124
// Call openScan one more time when it's already defined
125125
if( pOp->readTuples(NdbScanOperation::LM_Read) ) {
126-
ERR(pTrans->getNdbError());
126+
NDB_ERR(pTrans->getNdbError());
127127
pNdb->closeTransaction(pTrans);
128128
return NDBT_FAILED;
129129
}
@@ -132,23 +132,23 @@ ScanFunctions::scanReadFunctions(Ndb* pNdb,
132132
if (action==EqualAfterOpenScan){
133133
check = pOp->equal(tab.getColumn(0)->getName(), 10);
134134
if( check == -1 ) {
135-
ERR(pTrans->getNdbError());
135+
NDB_ERR(pTrans->getNdbError());
136136
pNdb->closeTransaction(pTrans);
137137
return NDBT_FAILED;
138138
}
139139
}
140140

141141
for(int a = 0; a<tab.getNoOfColumns(); a++){
142142
if(pOp->getValue(tab.getColumn(a)->getName()) == NULL) {
143-
ERR(pTrans->getNdbError());
143+
NDB_ERR(pTrans->getNdbError());
144144
pNdb->closeTransaction(pTrans);
145145
return NDBT_FAILED;
146146
}
147147
}
148148

149149
check = pTrans->execute(NoCommit);
150150
if( check == -1 ) {
151-
ERR(pTrans->getNdbError());
151+
NDB_ERR(pTrans->getNdbError());
152152
pNdb->closeTransaction(pTrans);
153153
return NDBT_FAILED;
154154
}
@@ -169,7 +169,7 @@ ScanFunctions::scanReadFunctions(Ndb* pNdb,
169169
// Test that we can closeTrans without stopScan
170170
pOp->close();
171171
if( check == -1 ) {
172-
ERR(pTrans->getNdbError());
172+
NDB_ERR(pTrans->getNdbError());
173173
pNdb->closeTransaction(pTrans);
174174
return NDBT_FAILED;
175175
}
@@ -196,7 +196,7 @@ ScanFunctions::scanReadFunctions(Ndb* pNdb,
196196
const NdbError err = pTrans->getNdbError();
197197

198198
if (err.status == NdbError::TemporaryError){
199-
ERR(err);
199+
NDB_ERR(err);
200200

201201
// Be cruel, call nextScanResult after error
202202
for(int i=0; i<10; i++){
@@ -222,7 +222,7 @@ ScanFunctions::scanReadFunctions(Ndb* pNdb,
222222

223223
continue;
224224
}
225-
ERR(err);
225+
NDB_ERR(err);
226226
pNdb->closeTransaction(pTrans);
227227
return NDBT_FAILED;
228228
}

‎storage/ndb/test/ndbapi/ScanInterpretTest.hpp

+29-29
Original file line numberDiff line numberDiff line change
@@ -58,13 +58,13 @@ ScanInterpretTest::addRowToInsert(Ndb* pNdb,
5858
NdbOperation* pOp =
5959
pInsTrans->getNdbOperation(restab.getName());
6060
if (pOp == NULL) {
61-
ERR(pInsTrans->getNdbError());
61+
NDB_ERR(pInsTrans->getNdbError());
6262
pNdb->closeTransaction(pInsTrans);
6363
return NDBT_FAILED;
6464
}
6565

6666
if( pOp->insertTuple() == -1 ) {
67-
ERR(pInsTrans->getNdbError());
67+
NDB_ERR(pInsTrans->getNdbError());
6868
pNdb->closeTransaction(pInsTrans);
6969
return NDBT_FAILED;
7070
}
@@ -113,7 +113,7 @@ ScanInterpretTest::addRowToInsert(Ndb* pNdb,
113113
break;
114114
}
115115
if(check != 0){
116-
ERR(pInsTrans->getNdbError());
116+
NDB_ERR(pInsTrans->getNdbError());
117117
pNdb->closeTransaction(pInsTrans);
118118
return NDBT_FAILED;
119119
}
@@ -130,12 +130,12 @@ ScanInterpretTest::addRowToCheckTrans(Ndb* pNdb,
130130
NdbOperation* pOp =
131131
pCheckTrans->getNdbOperation(restab.getName());
132132
if (pOp == NULL) {
133-
ERR(pNdb->getNdbError());
133+
NDB_ERR(pNdb->getNdbError());
134134
return NDBT_FAILED;
135135
}
136136

137137
if(pOp->readTuple() != 0) {
138-
ERR(pNdb->getNdbError());
138+
NDB_ERR(pNdb->getNdbError());
139139
return NDBT_FAILED;
140140
}
141141

@@ -179,7 +179,7 @@ ScanInterpretTest::addRowToCheckTrans(Ndb* pNdb,
179179
break;
180180
}
181181
if(check != 0){
182-
ERR(pNdb->getNdbError());
182+
NDB_ERR(pNdb->getNdbError());
183183
return NDBT_FAILED;
184184
}
185185
}
@@ -212,30 +212,30 @@ ScanInterpretTest::scanRead(Ndb* pNdb,
212212
if (pTrans == NULL) {
213213
const NdbError err = pNdb->getNdbError();
214214
if (err.status == NdbError::TemporaryError){
215-
ERR(err);
215+
NDB_ERR(err);
216216
NdbSleep_MilliSleep(50);
217217
retryAttempt++;
218218
continue;
219219
}
220-
ERR(err);
220+
NDB_ERR(err);
221221
return NDBT_FAILED;
222222
}
223223

224224
pOp = pTrans->getNdbScanOperation(tab.getName());
225225
if (pOp == NULL) {
226-
ERR(pTrans->getNdbError());
226+
NDB_ERR(pTrans->getNdbError());
227227
pNdb->closeTransaction(pTrans);
228228
return NDBT_FAILED;
229229
}
230230

231231
if( pOp->readTuples(NdbScanOperation::LM_Read, 0, parallelism) ) {
232-
ERR(pTrans->getNdbError());
232+
NDB_ERR(pTrans->getNdbError());
233233
pNdb->closeTransaction(pTrans);
234234
return NDBT_FAILED;
235235
}
236236

237237
if (filter.filterOp(pOp) != 0){
238-
ERR(pTrans->getNdbError());
238+
NDB_ERR(pTrans->getNdbError());
239239
pNdb->closeTransaction(pTrans);
240240
return NDBT_FAILED;
241241
}
@@ -244,14 +244,14 @@ ScanInterpretTest::scanRead(Ndb* pNdb,
244244
for(int a = 0; a<tab.getNoOfColumns(); a++){
245245
if((row.attributeStore(a) =
246246
pOp->getValue(tab.getColumn(a)->getName())) == 0) {
247-
ERR(pTrans->getNdbError());
247+
NDB_ERR(pTrans->getNdbError());
248248
pNdb->closeTransaction(pTrans);
249249
return NDBT_FAILED;
250250
}
251251
}
252252
check = pTrans->execute(NoCommit);
253253
if( check == -1 ) {
254-
ERR(pTrans->getNdbError());
254+
NDB_ERR(pTrans->getNdbError());
255255
pNdb->closeTransaction(pTrans);
256256
return NDBT_FAILED;
257257
}
@@ -271,7 +271,7 @@ ScanInterpretTest::scanRead(Ndb* pNdb,
271271
check = pTrans->execute(Commit);
272272
if( check == -1 ) {
273273
const NdbError err = pTrans->getNdbError();
274-
ERR(err);
274+
NDB_ERR(err);
275275
pNdb->closeTransaction(pTrans);
276276
return NDBT_FAILED;
277277
}
@@ -280,13 +280,13 @@ ScanInterpretTest::scanRead(Ndb* pNdb,
280280
const NdbError err = pTrans->getNdbError();
281281

282282
if (err.status == NdbError::TemporaryError){
283-
ERR(err);
283+
NDB_ERR(err);
284284
pNdb->closeTransaction(pTrans);
285285
NdbSleep_MilliSleep(50);
286286
retryAttempt++;
287287
continue;
288288
}
289-
ERR(err);
289+
NDB_ERR(err);
290290
pNdb->closeTransaction(pTrans);
291291
return NDBT_FAILED;
292292
}
@@ -324,30 +324,30 @@ ScanInterpretTest::scanReadVerify(Ndb* pNdb,
324324
if (pTrans == NULL) {
325325
const NdbError err = pNdb->getNdbError();
326326
if (err.status == NdbError::TemporaryError){
327-
ERR(err);
327+
NDB_ERR(err);
328328
NdbSleep_MilliSleep(50);
329329
retryAttempt++;
330330
continue;
331331
}
332-
ERR(err);
332+
NDB_ERR(err);
333333
return NDBT_FAILED;
334334
}
335335

336336

337337
pOp = pTrans->getNdbScanOperation(tab.getName());
338338
if (pOp == NULL) { if (pOp->getValue("KOL2") == 0){
339-
ERR(pNdb->getNdbError());
339+
NDB_ERR(pNdb->getNdbError());
340340
return NDBT_FAILED;
341341
}
342342

343343

344-
ERR(pTrans->getNdbError());
344+
NDB_ERR(pTrans->getNdbError());
345345
pNdb->closeTransaction(pTrans);
346346
return NDBT_FAILED;
347347
}
348348

349349
if( pOp->readTuples(NdbScanOperation::LM_Read, 0, parallelism) ) {
350-
ERR(pTrans->getNdbError());
350+
NDB_ERR(pTrans->getNdbError());
351351
pNdb->closeTransaction(pTrans);
352352
return NDBT_FAILED;
353353
}
@@ -356,14 +356,14 @@ ScanInterpretTest::scanReadVerify(Ndb* pNdb,
356356
for(int a = 0; a<tab.getNoOfColumns(); a++){
357357
if((row.attributeStore(a) =
358358
pOp->getValue(tab.getColumn(a)->getName())) == 0) {
359-
ERR(pTrans->getNdbError());
359+
NDB_ERR(pTrans->getNdbError());
360360
pNdb->closeTransaction(pTrans);
361361
return NDBT_FAILED;
362362
}
363363
}
364364
check = pTrans->execute(NoCommit);
365365
if( check == -1 ) {
366-
ERR(pTrans->getNdbError());
366+
NDB_ERR(pTrans->getNdbError());
367367
pNdb->closeTransaction(pTrans);
368368
return NDBT_FAILED;
369369
}
@@ -383,13 +383,13 @@ ScanInterpretTest::scanReadVerify(Ndb* pNdb,
383383
pExistTrans = pNdb->startTransaction();
384384
if (pExistTrans == NULL) {
385385
const NdbError err = pNdb->getNdbError();
386-
ERR(err);
386+
NDB_ERR(err);
387387
return NDBT_FAILED;
388388
}
389389
pNoExistTrans = pNdb->startTransaction();
390390
if (pNoExistTrans == NULL) {
391391
const NdbError err = pNdb->getNdbError();
392-
ERR(err);
392+
NDB_ERR(err);
393393
return NDBT_FAILED;
394394
}
395395
do {
@@ -419,7 +419,7 @@ ScanInterpretTest::scanReadVerify(Ndb* pNdb,
419419
check = pExistTrans->execute(Commit);
420420
if( check == -1 ) {
421421
const NdbError err = pExistTrans->getNdbError();
422-
ERR(err);
422+
NDB_ERR(err);
423423
if (err.code != 626){
424424
pNdb->closeTransaction(pExistTrans);
425425
pNdb->closeTransaction(pNoExistTrans);
@@ -440,7 +440,7 @@ ScanInterpretTest::scanReadVerify(Ndb* pNdb,
440440
const NdbError err = pNoExistTrans->getNdbError();
441441
// The transactions error code should be zero
442442
if (err.code != 626){
443-
ERR(err);
443+
NDB_ERR(err);
444444
pNdb->closeTransaction(pNoExistTrans);
445445
pNdb->closeTransaction(pTrans);
446446
return NDBT_FAILED;
@@ -465,13 +465,13 @@ ScanInterpretTest::scanReadVerify(Ndb* pNdb,
465465
const NdbError err = pTrans->getNdbError();
466466

467467
if (err.status == NdbError::TemporaryError){
468-
ERR(err);
468+
NDB_ERR(err);
469469
pNdb->closeTransaction(pTrans);
470470
NdbSleep_MilliSleep(50);
471471
retryAttempt++;
472472
continue;
473473
}
474-
ERR(err);
474+
NDB_ERR(err);
475475
pNdb->closeTransaction(pTrans);
476476
return NDBT_FAILED;
477477
}

0 commit comments

Comments
 (0)