mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
wl1292 - ndb autotest
Fix 4.1 memleak in Hugo ndb/test/include/HugoOperations.hpp: Fix mem leak in Hugo ndb/test/src/HugoTransactions.cpp: Fix mem leak in Hugo
This commit is contained in:
@ -100,7 +100,7 @@ protected:
|
|||||||
struct RsPair { NdbResultSet* m_result_set; int records; };
|
struct RsPair { NdbResultSet* m_result_set; int records; };
|
||||||
Vector<RsPair> m_result_sets;
|
Vector<RsPair> m_result_sets;
|
||||||
Vector<RsPair> m_executed_result_sets;
|
Vector<RsPair> m_executed_result_sets;
|
||||||
private:
|
|
||||||
NdbConnection* pTrans;
|
NdbConnection* pTrans;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -40,7 +40,6 @@ HugoTransactions::scanReadRecords(Ndb* pNdb,
|
|||||||
int retryAttempt = 0;
|
int retryAttempt = 0;
|
||||||
const int retryMax = 100;
|
const int retryMax = 100;
|
||||||
int check, a;
|
int check, a;
|
||||||
NdbConnection *pTrans;
|
|
||||||
NdbScanOperation *pOp;
|
NdbScanOperation *pOp;
|
||||||
|
|
||||||
while (true){
|
while (true){
|
||||||
@ -196,7 +195,6 @@ HugoTransactions::scanReadRecords(Ndb* pNdb,
|
|||||||
int retryAttempt = 0;
|
int retryAttempt = 0;
|
||||||
const int retryMax = 100;
|
const int retryMax = 100;
|
||||||
int check, a;
|
int check, a;
|
||||||
NdbConnection *pTrans;
|
|
||||||
NdbIndexScanOperation *pOp;
|
NdbIndexScanOperation *pOp;
|
||||||
|
|
||||||
while (true){
|
while (true){
|
||||||
@ -369,7 +367,6 @@ HugoTransactions::scanUpdateRecords1(Ndb* pNdb,
|
|||||||
int retryAttempt = 0;
|
int retryAttempt = 0;
|
||||||
const int retryMax = 100;
|
const int retryMax = 100;
|
||||||
int check, a;
|
int check, a;
|
||||||
NdbConnection *pTrans;
|
|
||||||
NdbOperation *pOp;
|
NdbOperation *pOp;
|
||||||
|
|
||||||
|
|
||||||
@ -536,7 +533,6 @@ HugoTransactions::scanUpdateRecords2(Ndb* pNdb,
|
|||||||
int retryAttempt = 0;
|
int retryAttempt = 0;
|
||||||
const int retryMax = 100;
|
const int retryMax = 100;
|
||||||
int check, a;
|
int check, a;
|
||||||
NdbConnection *pTrans;
|
|
||||||
NdbOperation *pOp;
|
NdbOperation *pOp;
|
||||||
|
|
||||||
|
|
||||||
@ -619,7 +615,6 @@ HugoTransactions::scanUpdateRecords2(Ndb* pNdb,
|
|||||||
|
|
||||||
int eof;
|
int eof;
|
||||||
int rows = 0;
|
int rows = 0;
|
||||||
NdbConnection* pUpTrans;
|
|
||||||
|
|
||||||
while((eof = pTrans->nextScanResult(true)) == 0){
|
while((eof = pTrans->nextScanResult(true)) == 0){
|
||||||
pUpTrans = pNdb->startTransaction();
|
pUpTrans = pNdb->startTransaction();
|
||||||
@ -702,7 +697,6 @@ HugoTransactions::scanUpdateRecords3(Ndb* pNdb,
|
|||||||
int retryAttempt = 0;
|
int retryAttempt = 0;
|
||||||
const int retryMax = 100;
|
const int retryMax = 100;
|
||||||
int check, a;
|
int check, a;
|
||||||
NdbConnection *pTrans;
|
|
||||||
NdbScanOperation *pOp;
|
NdbScanOperation *pOp;
|
||||||
|
|
||||||
|
|
||||||
@ -846,7 +840,6 @@ HugoTransactions::loadTable(Ndb* pNdb,
|
|||||||
int check, a;
|
int check, a;
|
||||||
int retryAttempt = 0;
|
int retryAttempt = 0;
|
||||||
int retryMax = 5;
|
int retryMax = 5;
|
||||||
NdbConnection *pTrans;
|
|
||||||
NdbOperation *pOp;
|
NdbOperation *pOp;
|
||||||
bool first_batch = true;
|
bool first_batch = true;
|
||||||
|
|
||||||
@ -992,7 +985,6 @@ HugoTransactions::fillTable(Ndb* pNdb,
|
|||||||
int check, a, b;
|
int check, a, b;
|
||||||
int retryAttempt = 0;
|
int retryAttempt = 0;
|
||||||
int retryMax = 5;
|
int retryMax = 5;
|
||||||
NdbConnection *pTrans;
|
|
||||||
NdbOperation *pOp;
|
NdbOperation *pOp;
|
||||||
|
|
||||||
g_info << "|- Inserting records..." << endl;
|
g_info << "|- Inserting records..." << endl;
|
||||||
@ -1384,7 +1376,6 @@ HugoTransactions::pkReadRecords(Ndb* pNdb,
|
|||||||
int retryAttempt = 0;
|
int retryAttempt = 0;
|
||||||
const int retryMax = 100;
|
const int retryMax = 100;
|
||||||
int check, a;
|
int check, a;
|
||||||
NdbConnection *pTrans;
|
|
||||||
NdbOperation *pOp;
|
NdbOperation *pOp;
|
||||||
|
|
||||||
if (batchsize == 0) {
|
if (batchsize == 0) {
|
||||||
@ -1521,7 +1512,6 @@ HugoTransactions::pkUpdateRecords(Ndb* pNdb,
|
|||||||
int retryAttempt = 0;
|
int retryAttempt = 0;
|
||||||
const int retryMax = 100;
|
const int retryMax = 100;
|
||||||
int check, a, b;
|
int check, a, b;
|
||||||
NdbConnection *pTrans;
|
|
||||||
NdbOperation *pOp;
|
NdbOperation *pOp;
|
||||||
|
|
||||||
allocRows(batch);
|
allocRows(batch);
|
||||||
@ -1689,7 +1679,6 @@ HugoTransactions::pkInterpretedUpdateRecords(Ndb* pNdb,
|
|||||||
int retryAttempt = 0;
|
int retryAttempt = 0;
|
||||||
const int retryMax = 100;
|
const int retryMax = 100;
|
||||||
int check, a;
|
int check, a;
|
||||||
NdbConnection *pTrans;
|
|
||||||
|
|
||||||
while (r < records){
|
while (r < records){
|
||||||
|
|
||||||
@ -1868,7 +1857,6 @@ HugoTransactions::pkDelRecords(Ndb* pNdb,
|
|||||||
int retryAttempt = 0;
|
int retryAttempt = 0;
|
||||||
const int retryMax = 100;
|
const int retryMax = 100;
|
||||||
int check, a;
|
int check, a;
|
||||||
NdbConnection *pTrans;
|
|
||||||
NdbOperation *pOp;
|
NdbOperation *pOp;
|
||||||
|
|
||||||
g_info << "|- Deleting records..." << endl;
|
g_info << "|- Deleting records..." << endl;
|
||||||
@ -1983,7 +1971,6 @@ HugoTransactions::lockRecords(Ndb* pNdb,
|
|||||||
int retryAttempt = 0;
|
int retryAttempt = 0;
|
||||||
const int retryMax = 100;
|
const int retryMax = 100;
|
||||||
int check, a, b;
|
int check, a, b;
|
||||||
NdbConnection *pTrans;
|
|
||||||
NdbOperation *pOp;
|
NdbOperation *pOp;
|
||||||
|
|
||||||
// Calculate how many records to lock in each batch
|
// Calculate how many records to lock in each batch
|
||||||
@ -2130,7 +2117,6 @@ HugoTransactions::indexReadRecords(Ndb* pNdb,
|
|||||||
int retryAttempt = 0;
|
int retryAttempt = 0;
|
||||||
const int retryMax = 100;
|
const int retryMax = 100;
|
||||||
int check, a;
|
int check, a;
|
||||||
NdbConnection *pTrans;
|
|
||||||
NdbOperation *pOp;
|
NdbOperation *pOp;
|
||||||
NdbIndexScanOperation *sOp;
|
NdbIndexScanOperation *sOp;
|
||||||
NdbResultSet * rs;
|
NdbResultSet * rs;
|
||||||
@ -2281,7 +2267,6 @@ HugoTransactions::indexUpdateRecords(Ndb* pNdb,
|
|||||||
int retryAttempt = 0;
|
int retryAttempt = 0;
|
||||||
const int retryMax = 100;
|
const int retryMax = 100;
|
||||||
int check, a, b;
|
int check, a, b;
|
||||||
NdbConnection *pTrans;
|
|
||||||
NdbOperation *pOp;
|
NdbOperation *pOp;
|
||||||
NdbScanOperation * sOp;
|
NdbScanOperation * sOp;
|
||||||
NdbResultSet * rs;
|
NdbResultSet * rs;
|
||||||
|
Reference in New Issue
Block a user