mirror of
https://git.openldap.org/openldap/openldap.git
synced 2025-03-07 14:18:15 +08:00
ITS#7402 tweak prev commit, use hex for txn IDs
This commit is contained in:
parent
c2783b9c5e
commit
b555730139
@ -159,7 +159,7 @@ retry: /* transaction retry */
|
||||
rs->sr_text = "internal error";
|
||||
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 );
|
||||
|
||||
opinfo.boi_oe.oe_key = bdb;
|
||||
@ -378,7 +378,7 @@ retry: /* transaction retry */
|
||||
rs->sr_text = "internal error";
|
||||
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 );
|
||||
|
||||
/* dn2id index */
|
||||
|
@ -241,7 +241,7 @@ bdb_online_index( void *ctx, void *arg )
|
||||
rc = TXN_BEGIN( bdb->bi_dbenv, NULL, &txn, bdb->bi_db_opflags );
|
||||
if ( rc )
|
||||
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 );
|
||||
if ( getnext ) {
|
||||
getnext = 0;
|
||||
|
@ -143,7 +143,7 @@ retry: /* transaction retry */
|
||||
/* begin transaction */
|
||||
rs->sr_err = TXN_BEGIN( bdb->bi_dbenv, NULL, <id,
|
||||
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 );
|
||||
rs->sr_text = NULL;
|
||||
if( rs->sr_err != 0 ) {
|
||||
@ -370,7 +370,7 @@ retry: /* transaction retry */
|
||||
rs->sr_text = "internal error";
|
||||
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 );
|
||||
|
||||
BDB_LOG_PRINTF( bdb->bi_dbenv, lt2, "slapd Starting delete %s(%d)",
|
||||
|
@ -514,7 +514,7 @@ retry: /* transaction retry */
|
||||
rs->sr_text = "internal error";
|
||||
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 );
|
||||
|
||||
opinfo.boi_oe.oe_key = bdb;
|
||||
@ -635,7 +635,7 @@ retry: /* transaction retry */
|
||||
rs->sr_text = "internal error";
|
||||
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 );
|
||||
/* Modify the entry */
|
||||
dummy = *e;
|
||||
|
@ -162,7 +162,7 @@ retry: /* transaction retry */
|
||||
rs->sr_text = "internal error";
|
||||
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 );
|
||||
|
||||
opinfo.boi_oe.oe_key = bdb;
|
||||
@ -603,7 +603,7 @@ retry: /* transaction retry */
|
||||
rs->sr_text = "internal error";
|
||||
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 );
|
||||
|
||||
/* delete old DN */
|
||||
|
@ -672,7 +672,7 @@ ID bdb_tool_entry_put(
|
||||
text->bv_val, 0, 0 );
|
||||
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 );
|
||||
}
|
||||
|
||||
@ -841,7 +841,7 @@ int bdb_tool_entry_reindex(
|
||||
db_strerror(rc), rc, 0 );
|
||||
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 );
|
||||
}
|
||||
|
||||
@ -933,7 +933,7 @@ ID bdb_tool_entry_modify(
|
||||
text->bv_val, 0, 0 );
|
||||
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 );
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user