Skip to content
Snippets Groups Projects
Commit 414aacab authored by Howard Chu's avatar Howard Chu Committed by Quanah Gibson-Mount
Browse files

ITS#7402 tweak prev commit, use hex for txn IDs

parent 5f7505f0
No related branches found
No related tags found
No related merge requests found
...@@ -159,7 +159,7 @@ retry: /* transaction retry */ ...@@ -159,7 +159,7 @@ retry: /* transaction retry */
rs->sr_text = "internal error"; rs->sr_text = "internal error";
goto return_results; goto return_results;
} }
Debug( LDAP_DEBUG_TRACE, LDAP_XSTRING(bdb_add) ": txn1 id: %u\n", Debug( LDAP_DEBUG_TRACE, LDAP_XSTRING(bdb_add) ": txn1 id: %x\n",
ltid->id(ltid), 0, 0 ); ltid->id(ltid), 0, 0 );
opinfo.boi_oe.oe_key = bdb; opinfo.boi_oe.oe_key = bdb;
...@@ -378,7 +378,7 @@ retry: /* transaction retry */ ...@@ -378,7 +378,7 @@ retry: /* transaction retry */
rs->sr_text = "internal error"; rs->sr_text = "internal error";
goto return_results; goto return_results;
} }
Debug( LDAP_DEBUG_TRACE, LDAP_XSTRING(bdb_add) ": txn2 id: %u\n", Debug( LDAP_DEBUG_TRACE, LDAP_XSTRING(bdb_add) ": txn2 id: %x\n",
lt2->id(lt2), 0, 0 ); lt2->id(lt2), 0, 0 );
/* dn2id index */ /* dn2id index */
......
...@@ -241,7 +241,7 @@ bdb_online_index( void *ctx, void *arg ) ...@@ -241,7 +241,7 @@ bdb_online_index( void *ctx, void *arg )
rc = TXN_BEGIN( bdb->bi_dbenv, NULL, &txn, bdb->bi_db_opflags ); rc = TXN_BEGIN( bdb->bi_dbenv, NULL, &txn, bdb->bi_db_opflags );
if ( rc ) if ( rc )
break; break;
Debug( LDAP_DEBUG_TRACE, LDAP_XSTRING(bdb_online_index) ": txn id: %u\n", Debug( LDAP_DEBUG_TRACE, LDAP_XSTRING(bdb_online_index) ": txn id: %x\n",
txn->id(txn), 0, 0 ); txn->id(txn), 0, 0 );
if ( getnext ) { if ( getnext ) {
getnext = 0; getnext = 0;
......
...@@ -143,7 +143,7 @@ retry: /* transaction retry */ ...@@ -143,7 +143,7 @@ retry: /* transaction retry */
/* begin transaction */ /* begin transaction */
rs->sr_err = TXN_BEGIN( bdb->bi_dbenv, NULL, &ltid, rs->sr_err = TXN_BEGIN( bdb->bi_dbenv, NULL, &ltid,
bdb->bi_db_opflags ); bdb->bi_db_opflags );
Debug( LDAP_DEBUG_TRACE, LDAP_XSTRING(bdb_delete) ": txn1 id: %u\n", Debug( LDAP_DEBUG_TRACE, LDAP_XSTRING(bdb_delete) ": txn1 id: %x\n",
ltid->id(ltid), 0, 0 ); ltid->id(ltid), 0, 0 );
rs->sr_text = NULL; rs->sr_text = NULL;
if( rs->sr_err != 0 ) { if( rs->sr_err != 0 ) {
...@@ -370,7 +370,7 @@ retry: /* transaction retry */ ...@@ -370,7 +370,7 @@ retry: /* transaction retry */
rs->sr_text = "internal error"; rs->sr_text = "internal error";
goto return_results; goto return_results;
} }
Debug( LDAP_DEBUG_TRACE, LDAP_XSTRING(bdb_delete) ": txn2 id: %u\n", Debug( LDAP_DEBUG_TRACE, LDAP_XSTRING(bdb_delete) ": txn2 id: %x\n",
lt2->id(lt2), 0, 0 ); lt2->id(lt2), 0, 0 );
BDB_LOG_PRINTF( bdb->bi_dbenv, lt2, "slapd Starting delete %s(%d)", BDB_LOG_PRINTF( bdb->bi_dbenv, lt2, "slapd Starting delete %s(%d)",
......
...@@ -514,7 +514,7 @@ retry: /* transaction retry */ ...@@ -514,7 +514,7 @@ retry: /* transaction retry */
rs->sr_text = "internal error"; rs->sr_text = "internal error";
goto return_results; goto return_results;
} }
Debug( LDAP_DEBUG_TRACE, LDAP_XSTRING(bdb_modify) ": txn1 id: %u\n", Debug( LDAP_DEBUG_TRACE, LDAP_XSTRING(bdb_modify) ": txn1 id: %x\n",
ltid->id(ltid), 0, 0 ); ltid->id(ltid), 0, 0 );
opinfo.boi_oe.oe_key = bdb; opinfo.boi_oe.oe_key = bdb;
...@@ -635,7 +635,7 @@ retry: /* transaction retry */ ...@@ -635,7 +635,7 @@ retry: /* transaction retry */
rs->sr_text = "internal error"; rs->sr_text = "internal error";
goto return_results; goto return_results;
} }
Debug( LDAP_DEBUG_TRACE, LDAP_XSTRING(bdb_modify) ": txn2 id: %u\n", Debug( LDAP_DEBUG_TRACE, LDAP_XSTRING(bdb_modify) ": txn2 id: %x\n",
lt2->id(lt2), 0, 0 ); lt2->id(lt2), 0, 0 );
/* Modify the entry */ /* Modify the entry */
dummy = *e; dummy = *e;
......
...@@ -162,7 +162,7 @@ retry: /* transaction retry */ ...@@ -162,7 +162,7 @@ retry: /* transaction retry */
rs->sr_text = "internal error"; rs->sr_text = "internal error";
goto return_results; goto return_results;
} }
Debug( LDAP_DEBUG_TRACE, LDAP_XSTRING(bdb_modrdn) ": txn1 id: %u\n", Debug( LDAP_DEBUG_TRACE, LDAP_XSTRING(bdb_modrdn) ": txn1 id: %x\n",
ltid->id(ltid), 0, 0 ); ltid->id(ltid), 0, 0 );
opinfo.boi_oe.oe_key = bdb; opinfo.boi_oe.oe_key = bdb;
...@@ -603,7 +603,7 @@ retry: /* transaction retry */ ...@@ -603,7 +603,7 @@ retry: /* transaction retry */
rs->sr_text = "internal error"; rs->sr_text = "internal error";
goto return_results; goto return_results;
} }
Debug( LDAP_DEBUG_TRACE, LDAP_XSTRING(bdb_modrdn) ": txn2 id: %u\n", Debug( LDAP_DEBUG_TRACE, LDAP_XSTRING(bdb_modrdn) ": txn2 id: %x\n",
lt2->id(lt2), 0, 0 ); lt2->id(lt2), 0, 0 );
/* delete old DN */ /* delete old DN */
......
...@@ -672,7 +672,7 @@ ID bdb_tool_entry_put( ...@@ -672,7 +672,7 @@ ID bdb_tool_entry_put(
text->bv_val, 0, 0 ); text->bv_val, 0, 0 );
return NOID; return NOID;
} }
Debug( LDAP_DEBUG_TRACE, LDAP_XSTRING(bdb_tool_entry_put) ": txn id: %u\n", Debug( LDAP_DEBUG_TRACE, LDAP_XSTRING(bdb_tool_entry_put) ": txn id: %x\n",
tid->id(tid), 0, 0 ); tid->id(tid), 0, 0 );
} }
...@@ -841,7 +841,7 @@ int bdb_tool_entry_reindex( ...@@ -841,7 +841,7 @@ int bdb_tool_entry_reindex(
db_strerror(rc), rc, 0 ); db_strerror(rc), rc, 0 );
goto done; goto done;
} }
Debug( LDAP_DEBUG_TRACE, LDAP_XSTRING(bdb_tool_entry_reindex) ": txn id: %u\n", Debug( LDAP_DEBUG_TRACE, LDAP_XSTRING(bdb_tool_entry_reindex) ": txn id: %x\n",
tid->id(tid), 0, 0 ); tid->id(tid), 0, 0 );
} }
...@@ -933,7 +933,7 @@ ID bdb_tool_entry_modify( ...@@ -933,7 +933,7 @@ ID bdb_tool_entry_modify(
text->bv_val, 0, 0 ); text->bv_val, 0, 0 );
return NOID; return NOID;
} }
Debug( LDAP_DEBUG_TRACE, LDAP_XSTRING(bdb_tool_entry_modify) ": txn id: %u\n", Debug( LDAP_DEBUG_TRACE, LDAP_XSTRING(bdb_tool_entry_modify) ": txn id: %x\n",
tid->id(tid), 0, 0 ); tid->id(tid), 0, 0 );
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment