8
0
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-24 03:23:03 +01:00

Fixed (porting?) bugs related to GBAK and Services API.

This commit is contained in:
dimitr 2003-03-21 16:19:16 +00:00
parent 2aee8ee34c
commit fa6f9a83e5
2 changed files with 10 additions and 9 deletions

View File

@ -36,7 +36,7 @@
*/ */
/* /*
$Id: backup.epp,v 1.17 2003-03-04 00:00:31 brodsom Exp $ $Id: backup.epp,v 1.18 2003-03-21 16:19:15 dimitr Exp $
*/ */
#include "firebird.h" #include "firebird.h"
@ -61,10 +61,12 @@ $Id: backup.epp,v 1.17 2003-03-04 00:00:31 brodsom Exp $
/* in thread data. This is also done for other statics generated by */ /* in thread data. This is also done for other statics generated by */
/* GPRE. This is to avoid multiple threading problems with module */ /* GPRE. This is to avoid multiple threading problems with module */
/* level statics. */ /* level statics. */
DATABASE DB = STATIC FILENAME "yachts.lnk" RUNTIME * dbb_file; DATABASE DB = STATIC FILENAME "yachts.lnk" RUNTIME * dbb_file;
#define DB tdgbl->db_handle
#define DB tdgbl->db_handle
#define gds_trans tdgbl->tr_handle
#define isc_trans tdgbl->tr_handle #define isc_trans tdgbl->tr_handle
#define isc_status tdgbl->status
/* /*
#define DEBUG 1 #define DEBUG 1
@ -296,14 +298,14 @@ int BACKUP_backup(TEXT* dbb_file, TEXT* file_name)
else else
{ {
EXEC SQL SET TRANSACTION NO_AUTO_UNDO; EXEC SQL SET TRANSACTION NO_AUTO_UNDO;
if (isc_status[1]) if (tdgbl->status[1])
EXEC SQL SET TRANSACTION; EXEC SQL SET TRANSACTION;
} }
if (!isc_trans) if (!isc_trans)
{ {
EXEC SQL SET TRANSACTION NAME isc_trans NO_AUTO_UNDO; EXEC SQL SET TRANSACTION NAME isc_trans NO_AUTO_UNDO;
if (isc_status[1]) if (tdgbl->status[1])
EXEC SQL SET TRANSACTION NAME isc_trans; EXEC SQL SET TRANSACTION NAME isc_trans;
} }
@ -2627,7 +2629,7 @@ static void set_capabilities(void)
END_ERROR; END_ERROR;
} }
isc_release_request(isc_status, GDS_REF(req)); isc_release_request(tdgbl->status, GDS_REF(req));
} }

View File

@ -24,7 +24,7 @@
* *
*/ */
/* /*
$Id: restore.epp,v 1.23 2003-03-09 21:16:25 skidder Exp $ $Id: restore.epp,v 1.24 2003-03-21 16:19:16 dimitr Exp $
*/ */
#include "firebird.h" #include "firebird.h"
@ -55,9 +55,8 @@ $Id: restore.epp,v 1.23 2003-03-09 21:16:25 skidder Exp $
DATABASE DB = STATIC FILENAME "yachts.lnk"; DATABASE DB = STATIC FILENAME "yachts.lnk";
#define DB tdgbl->db_handle #define DB tdgbl->db_handle
#define gds_trans tdgbl->tr_handle #define gds_trans tdgbl->tr_handle
#define isc_status tdgbl->status
/*** /***
#define DEBUG 1 #define DEBUG 1