cleanup error messages and logs

diff --git a/servers/slapd/back-sql/schema-map.c b/servers/slapd/back-sql/schema-map.c
index e62948adc5d4f460152e803f7a3e56ca6289f9e4..143fd494f4ce18e56f487e854ea4187baf5f4d4c 100644 (file)
--- a/servers/slapd/back-sql/schema-map.c
+++ b/servers/slapd/back-sql/schema-map.c
@@ -355,14 +355,16 @@ backsql_load_schema_map( backsql_info *si, SQLHDBC dbh )
                rc = SQLExecute( at_sth );
                if ( rc != SQL_SUCCESS ) {
                        Debug( LDAP_DEBUG_TRACE, "backsql_load_schema_map(): "
-                               "error executing at_query: \n", 0, 0, 0 );
+                               "error executing at_query\n"
+                               "    \"%s\"\n"
+                               "    with param oc_id=\"%lu\": \n",
+                               si->at_query, oc_id, 0 );
                        backsql_PrintErrors( SQL_NULL_HENV, dbh, at_sth, rc );
                        return LDAP_OTHER;
                }
 
                backsql_BindRowAsStrings( at_sth, &at_row );
-               rc = SQLFetch( at_sth );
-               for ( ; BACKSQL_SUCCESS(rc); rc = SQLFetch( at_sth ) ) {
+               for ( ; rc = SQLFetch( at_sth ), BACKSQL_SUCCESS( rc ); ) {
                        const char      *text = NULL;
                        struct berval   bv;
                        struct berbuf   bb = BB_NULL;