1
1
/*
2
- Copyright (c) 2003, 2019 , Oracle and/or its affiliates. All rights reserved .
2
+ Copyright (c) 2003, 2020 , Oracle and/or its affiliates.
3
3
4
4
This program is free software; you can redistribute it and/or modify
5
5
it under the terms of the GNU General Public License, version 2.0,
@@ -862,8 +862,8 @@ Ndb::startTransaction(const NdbDictionary::Table* table,
862
862
theImpl->incClientStat (TransStartCount, 1 );
863
863
864
864
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,
867
867
(long ) (trans ? trans->getTransactionId () : 0 )));
868
868
DBUG_RETURN (trans);
869
869
}
@@ -885,8 +885,8 @@ Ndb::startTransaction(Uint32 nodeId,
885
885
theImpl->incClientStat (TransStartCount, 1 );
886
886
887
887
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,
890
890
(long ) (trans ? trans->getTransactionId () : 0 )));
891
891
DBUG_RETURN (trans);
892
892
}
@@ -961,8 +961,8 @@ Ndb::startTransaction(const NdbDictionary::Table *table,
961
961
962
962
{
963
963
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,
966
966
(long ) (trans ? trans->getTransactionId () : 0 )));
967
967
DBUG_RETURN (trans);
968
968
}
@@ -984,7 +984,7 @@ Ndb::hupp(NdbTransaction* pBuddyTrans)
984
984
{
985
985
DBUG_ENTER (" Ndb::hupp" );
986
986
987
- DBUG_PRINT (" enter" , (" trans: 0x%lx " , ( long ) pBuddyTrans));
987
+ DBUG_PRINT (" enter" , (" trans: %p " , pBuddyTrans));
988
988
989
989
Uint32 aPriority = 0 ;
990
990
if (pBuddyTrans == NULL ){
@@ -1012,8 +1012,8 @@ Ndb::hupp(NdbTransaction* pBuddyTrans)
1012
1012
}
1013
1013
pCon->setTransactionId (pBuddyTrans->getTransactionId ());
1014
1014
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,
1017
1017
(long ) (pCon ? pCon->getTransactionId () : 0 )));
1018
1018
DBUG_RETURN (pCon);
1019
1019
} else {
@@ -1081,7 +1081,7 @@ Ndb::startTransactionLocal(Uint32 aPriority, Uint32 nodeId, Uint32 instance)
1081
1081
}// if
1082
1082
#ifdef VM_TRACE
1083
1083
if (tConnection->theListState != NdbTransaction::NotInList) {
1084
- printState (" startTransactionLocal %lx " , ( long ) tConnection);
1084
+ printState (" startTransactionLocal %p " , tConnection);
1085
1085
abort ();
1086
1086
}
1087
1087
#endif
@@ -1163,8 +1163,8 @@ Ndb::closeTransaction(NdbTransaction* aConnection)
1163
1163
NdbSleep_MilliSleep (1000 );
1164
1164
fprintf (stderr, " Ndb::closeTransaction() resuming\n " );
1165
1165
});
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,
1168
1168
(long ) aConnection->getTransactionId ()));
1169
1169
DBUG_PRINT (" info" ,(" magic number: 0x%x TCConPtr: 0x%x theMyRef: 0x%x 0x%x" ,
1170
1170
aConnection->theMagicNumber , aConnection->theTCConPtr ,
0 commit comments