Skip to content

Commit 2623aab

Browse files
author
magnus.blaudd@oracle.com
committed
Merge in patch for bug#18350021 REMOVE USAGE OF LINT_INIT FROM NDB
- removes usage of LINT_INIT from NDB code base
1 parent 77c9d3f commit 2623aab

File tree

7 files changed

+0
-14
lines changed

7 files changed

+0
-14
lines changed

sql/ha_ndbcluster.cc

-2
Original file line numberDiff line numberDiff line change
@@ -17181,7 +17181,6 @@ int ndbcluster_alter_tablespace(handlerton *hton,
1718117181
const char *errmsg;
1718217182
Ndb *ndb;
1718317183
DBUG_ENTER("ndbcluster_alter_tablespace");
17184-
LINT_INIT(errmsg);
1718517184

1718617185
ndb= check_ndb_in_thd(thd);
1718717186
if (ndb == NULL)
@@ -17486,7 +17485,6 @@ bool ha_ndbcluster::get_no_parts(const char *name, uint *no_parts)
1748617485
NDBDICT *dict;
1748717486
int err;
1748817487
DBUG_ENTER("ha_ndbcluster::get_no_parts");
17489-
LINT_INIT(err);
1749017488

1749117489
set_dbname(name);
1749217490
set_tabname(name);

sql/ha_ndbcluster_binlog.cc

-2
Original file line numberDiff line numberDiff line change
@@ -1412,8 +1412,6 @@ int ndbcluster_find_all_files(THD *thd)
14121412

14131413
dict= ndb->getDictionary();
14141414

1415-
LINT_INIT(unhandled);
1416-
LINT_INIT(skipped);
14171415
do
14181416
{
14191417
NdbDictionary::Dictionary::List list;

storage/ndb/src/kernel/blocks/backup/Backup.cpp

-5
Original file line numberDiff line numberDiff line change
@@ -1269,9 +1269,6 @@ Backup::checkNodeFail(Signal* signal,
12691269
#endif
12701270

12711271
Uint32 gsn, len, pos;
1272-
LINT_INIT(gsn);
1273-
LINT_INIT(len);
1274-
LINT_INIT(pos);
12751272
ptr.p->nodes.bitANDC(mask);
12761273
switch(ptr.p->masterData.gsn){
12771274
case GSN_DEFINE_BACKUP_REQ:
@@ -2540,7 +2537,6 @@ Backup::sendDropTrig(Signal* signal, BackupRecordPtr ptr)
25402537
BackupFilePtr filePtr LINT_SET_PTR;
25412538
ptr.p->files.getPtr(filePtr, ptr.p->logFilePtr);
25422539
Uint32 * dst;
2543-
LINT_INIT(dst);
25442540
ndbrequire(filePtr.p->operation.dataBuffer.getWritePtr(&dst, 1));
25452541
* dst = 0;
25462542
filePtr.p->operation.dataBuffer.updateWritePtr(1);
@@ -2553,7 +2549,6 @@ Backup::sendDropTrig(Signal* signal, BackupRecordPtr ptr)
25532549
const Uint32 gcpSz = sizeof(BackupFormat::CtlFile::GCPEntry) >> 2;
25542550

25552551
Uint32 * dst;
2556-
LINT_INIT(dst);
25572552
ndbrequire(filePtr.p->operation.dataBuffer.getWritePtr(&dst, gcpSz));
25582553

25592554
BackupFormat::CtlFile::GCPEntry * gcp =

storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp

-2
Original file line numberDiff line numberDiff line change
@@ -8116,7 +8116,6 @@ Dbdih::sendAddFragreq(Signal* signal, ConnectRecordPtr connectPtr,
81168116
jam();
81178117
const Uint32 fragCount = connectPtr.p->m_alter.m_totalfragments;
81188118
ReplicaRecordPtr replicaPtr;
8119-
LINT_INIT(replicaPtr.p);
81208119
replicaPtr.i = RNIL;
81218120
FragmentstorePtr fragPtr;
81228121
for(; fragId<fragCount; fragId++){
@@ -15292,7 +15291,6 @@ Dbdih::findBestLogNode(CreateReplicaRecord* createReplica,
1529215291
{
1529315292
ConstPtr<ReplicaRecord> fblFoundReplicaPtr;
1529415293
ConstPtr<ReplicaRecord> fblReplicaPtr;
15295-
LINT_INIT(fblFoundReplicaPtr.p);
1529615294

1529715295
/* --------------------------------------------------------------------- */
1529815296
/* WE START WITH ZERO AS FOUND TO ENSURE THAT FIRST HIT WILL BE */

storage/ndb/src/kernel/blocks/suma/Suma.cpp

-1
Original file line numberDiff line numberDiff line change
@@ -6281,7 +6281,6 @@ Suma::seize_page()
62816281
ptr.p->m_free = count;
62826282

62836283
Buffer_page* page;
6284-
LINT_INIT(page);
62856284
for(Uint32 i = 0; i<count; i++)
62866285
{
62876286
page = c_page_pool.getPtr(ref);

storage/ndb/src/kernel/vm/DLHashTable.hpp

-1
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,6 @@ DLMHashTable<P, T, M>::remove(Ptr<T> & ptr, const T & key)
310310
Uint32 i;
311311
T * p;
312312
Ptr<T> prev;
313-
LINT_INIT(prev.p);
314313
prev.i = RNIL;
315314

316315
i = hashValues[hv];

storage/ndb/src/kernel/vm/SimulatedBlock.cpp

-1
Original file line numberDiff line numberDiff line change
@@ -3770,7 +3770,6 @@ SimulatedBlock::xfrm_attr(Uint32 attrDesc, CHARSET_INFO* cs,
37703770
{
37713771
jam();
37723772
Uint32 len;
3773-
LINT_INIT(len);
37743773
switch(array){
37753774
case NDB_ARRAYTYPE_SHORT_VAR:
37763775
len = 1 + srcPtr[0];

0 commit comments

Comments
 (0)