|
1 | 1 | /*
|
2 |
| - Copyright (c) 2003, 2017, 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,
|
@@ -132,7 +132,7 @@ NdbObjectIdMap::map(void * object)
|
132 | 132 | m_firstFree = m_map[ff].getNext();
|
133 | 133 | m_map[ff].setObj(object);
|
134 | 134 |
|
135 |
| - DBUG_PRINT("info",("NdbObjectIdMap::map(0x%lx) %u", (long) object, ff<<2)); |
| 135 | + DBUG_PRINT("info",("NdbObjectIdMap::map(%p) %u", object, ff<<2)); |
136 | 136 |
|
137 | 137 | return ff<<2;
|
138 | 138 | }
|
@@ -162,15 +162,15 @@ NdbObjectIdMap::unmap(Uint32 id, void *object)
|
162 | 162 | }
|
163 | 163 | else
|
164 | 164 | {
|
165 |
| - g_eventLogger->error("NdbObjectIdMap::unmap(%u, 0x%lx) obj=0x%lx", |
166 |
| - id, (long) object, (long) obj); |
167 |
| - DBUG_PRINT("error",("NdbObjectIdMap::unmap(%u, 0x%lx) obj=0x%lx", |
168 |
| - id, (long) object, (long) obj)); |
| 165 | + g_eventLogger->error("NdbObjectIdMap::unmap(%u, %p) obj=%p", |
| 166 | + id, object, obj); |
| 167 | + DBUG_PRINT("error",("NdbObjectIdMap::unmap(%u, %p) obj=%p", |
| 168 | + id, object, obj)); |
169 | 169 | assert(false);
|
170 | 170 | return 0;
|
171 | 171 | }
|
172 | 172 |
|
173 |
| - DBUG_PRINT("info",("NdbObjectIdMap::unmap(%u) obj=0x%lx", id, (long) obj)); |
| 173 | + DBUG_PRINT("info",("NdbObjectIdMap::unmap(%u) obj=%p", id, obj)); |
174 | 174 |
|
175 | 175 | return obj;
|
176 | 176 | }
|
|
0 commit comments