View | Details | Raw Unified | Return to bug 241782
Collapse All | Expand All

(-)dbdimp.c (-6 / +10 lines)
Lines 113-119 Link Here
113
113
114
    if (DBIc_TRACE_LEVEL(imp_xxh) >= 2)
114
    if (DBIc_TRACE_LEVEL(imp_xxh) >= 2)
115
        PerlIO_printf(DBIc_LOGPIO(imp_xxh), "%s error %d recorded: %s\n", 
115
        PerlIO_printf(DBIc_LOGPIO(imp_xxh), "%s error %d recorded: %s\n", 
116
            what, rc, SvPV(errstr,na));
116
            what, rc, SvPV(errstr,PL_na));
117
}
117
}
118
118
119
#define CALC_AVAILABLE(buff) sizeof(buff) - strlen(buff) - 1
119
#define CALC_AVAILABLE(buff) sizeof(buff) - strlen(buff) - 1
Lines 486-495 Link Here
486
    ISC_STATUS status[ISC_STATUS_LENGTH];
486
    ISC_STATUS status[ISC_STATUS_LENGTH];
487
487
488
    char buffer[100];
488
    char buffer[100];
489
489
    char req[] = {
490
        isc_info_ods_version,
491
        isc_info_end
492
    };
490
    DBI_TRACE_imp_xxh(imp_dbh, 1, (DBIc_LOGPIO(imp_dbh), "dbd_db_ping\n"));
493
    DBI_TRACE_imp_xxh(imp_dbh, 1, (DBIc_LOGPIO(imp_dbh), "dbd_db_ping\n"));
491
494
492
    if (isc_database_info(status, &(imp_dbh->db), 0, NULL, sizeof(buffer), buffer))
495
//    if (isc_database_info(status, &(imp_dbh->db), 0, NULL, sizeof(buffer), buffer))
496
    if (isc_database_info(status, &(imp_dbh->db), sizeof(req), req, sizeof(buffer), buffer))
493
        if (ib_error_check(dbh, status))
497
        if (ib_error_check(dbh, status))
494
            return FALSE;
498
            return FALSE;
495
    return TRUE;
499
    return TRUE;
Lines 693-699 Link Here
693
        return Nullsv;
697
        return Nullsv;
694
    else
698
    else
695
    {
699
    {
696
        if ((result == &sv_yes) || (result == &sv_no))
700
        if ((result == &PL_sv_yes) || (result == &PL_sv_no))
697
            return result;
701
            return result;
698
        else
702
        else
699
            return sv_2mortal(result);
703
            return sv_2mortal(result);
Lines 1991-1998 Link Here
1991
        DBIh_EVENT2(drh, ERROR_event, DBIc_ERR(imp_drh), DBIc_ERRSTR(imp_drh));
1995
        DBIh_EVENT2(drh, ERROR_event, DBIc_ERR(imp_drh), DBIc_ERRSTR(imp_drh));
1992
        return FALSE;
1996
        return FALSE;
1993
    }
1997
    }
1994
    if (perl_destruct_level)
1998
    if (PL_perl_destruct_level)
1995
        perl_destruct_level = 0;
1999
        PL_perl_destruct_level = 0;
1996
    return FALSE;
2000
    return FALSE;
1997
2001

Return to bug 241782