Attachment 208943 Details for Bug 241782 – dbdimp.c patch

[patch] dbdimp.c patch

dbdimp.c.patch (text/plain), 1.56 KB, created by Yuri Perejilin on 2019-11-07 13:50:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yuri Perejilin

Created: 2019-11-07 13:50:25 UTC

Size: 1.56 KB

patch

obsolete

>--- dbdimp.c.orig	2008-01-08 06:02:45.000000000 +0000
>+++ dbdimp.c	2019-11-07 13:22:17.842085000 +0000
>@@ -113,7 +113,7 @@
> 
>     if (DBIc_TRACE_LEVEL(imp_xxh) >= 2)
>         PerlIO_printf(DBIc_LOGPIO(imp_xxh), "%s error %d recorded: %s\n", 
>-            what, rc, SvPV(errstr,na));
>+            what, rc, SvPV(errstr,PL_na));
> }
> 
> #define CALC_AVAILABLE(buff) sizeof(buff) - strlen(buff) - 1
>@@ -486,10 +486,14 @@
>     ISC_STATUS status[ISC_STATUS_LENGTH];
> 
>     char buffer[100];
>-
>+    char req[] = {
>+        isc_info_ods_version,
>+        isc_info_end
>+    };
>     DBI_TRACE_imp_xxh(imp_dbh, 1, (DBIc_LOGPIO(imp_dbh), "dbd_db_ping\n"));
> 
>-    if (isc_database_info(status, &(imp_dbh->db), 0, NULL, sizeof(buffer), buffer))
>+//    if (isc_database_info(status, &(imp_dbh->db), 0, NULL, sizeof(buffer), buffer))
>+    if (isc_database_info(status, &(imp_dbh->db), sizeof(req), req, sizeof(buffer), buffer))
>         if (ib_error_check(dbh, status))
>             return FALSE;
>     return TRUE;
>@@ -693,7 +697,7 @@
>         return Nullsv;
>     else
>     {
>-        if ((result == &sv_yes) || (result == &sv_no))
>+        if ((result == &PL_sv_yes) || (result == &PL_sv_no))
>             return result;
>         else
>             return sv_2mortal(result);
>@@ -1991,8 +1995,8 @@
>         DBIh_EVENT2(drh, ERROR_event, DBIc_ERR(imp_drh), DBIc_ERRSTR(imp_drh));
>         return FALSE;
>     }
>-    if (perl_destruct_level)
>-        perl_destruct_level = 0;
>+    if (PL_perl_destruct_level)
>+        PL_perl_destruct_level = 0;
>     return FALSE;
>}
>

Actions: View | Diff

Attachments on bug 241782: 208943