Skip to content

Commit d096c3e

Browse files
committed
Bug#32107056 SEVERAL COMPILE WARNINGS FOR MYSQL CLUSTER ON WINDOWS WITH VS 2019 [#7] [noclose]
storage\ndb\src\ndbapi\Ndb.cpp: warning C4302: 'type cast': truncation from 'NdbTransaction *' to 'long' storage\ndb\src\ndbapi\Ndb.cpp: warning C4311: 'type cast': pointer truncation from 'NdbTransaction *' to 'long' Change-Id: Ife214c6d9dad2e7fac6a99c00974cda2c37fb722
1 parent ba9522b commit d096c3e

File tree

1 file changed

+13
-13
lines changed

1 file changed

+13
-13
lines changed

storage/ndb/src/ndbapi/Ndb.cpp

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
2+
Copyright (c) 2003, 2020, Oracle and/or its affiliates.
33
44
This program is free software; you can redistribute it and/or modify
55
it under the terms of the GNU General Public License, version 2.0,
@@ -862,8 +862,8 @@ Ndb::startTransaction(const NdbDictionary::Table* table,
862862
theImpl->incClientStat(TransStartCount, 1);
863863

864864
NdbTransaction *trans= startTransactionLocal(0, nodeId, 0);
865-
DBUG_PRINT("exit",("start trans: 0x%lx transid: 0x%lx",
866-
(long) trans,
865+
DBUG_PRINT("exit",("start trans: %p transid: 0x%lx",
866+
trans,
867867
(long) (trans ? trans->getTransactionId() : 0)));
868868
DBUG_RETURN(trans);
869869
}
@@ -885,8 +885,8 @@ Ndb::startTransaction(Uint32 nodeId,
885885
theImpl->incClientStat(TransStartCount, 1);
886886

887887
NdbTransaction *trans= startTransactionLocal(0, nodeId, instanceId);
888-
DBUG_PRINT("exit",("start trans: 0x%lx transid: 0x%lx",
889-
(long) trans,
888+
DBUG_PRINT("exit",("start trans: %p transid: 0x%lx",
889+
trans,
890890
(long) (trans ? trans->getTransactionId() : 0)));
891891
DBUG_RETURN(trans);
892892
}
@@ -961,8 +961,8 @@ Ndb::startTransaction(const NdbDictionary::Table *table,
961961

962962
{
963963
NdbTransaction *trans= startTransactionLocal(0, nodeId, 0);
964-
DBUG_PRINT("exit",("start trans: 0x%lx transid: 0x%lx",
965-
(long) trans,
964+
DBUG_PRINT("exit",("start trans: %p transid: 0x%lx",
965+
trans,
966966
(long) (trans ? trans->getTransactionId() : 0)));
967967
DBUG_RETURN(trans);
968968
}
@@ -984,7 +984,7 @@ Ndb::hupp(NdbTransaction* pBuddyTrans)
984984
{
985985
DBUG_ENTER("Ndb::hupp");
986986

987-
DBUG_PRINT("enter", ("trans: 0x%lx", (long) pBuddyTrans));
987+
DBUG_PRINT("enter", ("trans: %p", pBuddyTrans));
988988

989989
Uint32 aPriority = 0;
990990
if (pBuddyTrans == NULL){
@@ -1012,8 +1012,8 @@ Ndb::hupp(NdbTransaction* pBuddyTrans)
10121012
}
10131013
pCon->setTransactionId(pBuddyTrans->getTransactionId());
10141014
pCon->setBuddyConPtr((Uint32)pBuddyTrans->getTC_ConnectPtr());
1015-
DBUG_PRINT("exit", ("hupp trans: 0x%lx transid: 0x%lx",
1016-
(long) pCon,
1015+
DBUG_PRINT("exit", ("hupp trans: %p transid: 0x%lx",
1016+
pCon,
10171017
(long) (pCon ? pCon->getTransactionId() : 0)));
10181018
DBUG_RETURN(pCon);
10191019
} else {
@@ -1081,7 +1081,7 @@ Ndb::startTransactionLocal(Uint32 aPriority, Uint32 nodeId, Uint32 instance)
10811081
}//if
10821082
#ifdef VM_TRACE
10831083
if (tConnection->theListState != NdbTransaction::NotInList) {
1084-
printState("startTransactionLocal %lx", (long)tConnection);
1084+
printState("startTransactionLocal %p", tConnection);
10851085
abort();
10861086
}
10871087
#endif
@@ -1163,8 +1163,8 @@ Ndb::closeTransaction(NdbTransaction* aConnection)
11631163
NdbSleep_MilliSleep(1000);
11641164
fprintf(stderr, "Ndb::closeTransaction() resuming\n");
11651165
});
1166-
DBUG_PRINT("info",("close trans: 0x%lx transid: 0x%lx",
1167-
(long) aConnection,
1166+
DBUG_PRINT("info",("close trans: %p transid: 0x%lx",
1167+
aConnection,
11681168
(long) aConnection->getTransactionId()));
11691169
DBUG_PRINT("info",("magic number: 0x%x TCConPtr: 0x%x theMyRef: 0x%x 0x%x",
11701170
aConnection->theMagicNumber, aConnection->theTCConPtr,

0 commit comments

Comments
 (0)