mirror of
https://github.com/FirebirdSQL/firebird.git
synced 2025-01-23 18:43:03 +01:00
Fixed CORE-1124.
This commit is contained in:
parent
19df9afe07
commit
367a315eec
@ -652,7 +652,6 @@ void nbackup::backup_database(int level, const char* fname)
|
||||
if (!guid_found)
|
||||
b_error::raise("Internal error. Cannot get backup guid clumplet");
|
||||
|
||||
|
||||
// Write data to backup file
|
||||
ULONG backup_scn = header->hdr_header.pag_scn - 1;
|
||||
if (level) {
|
||||
@ -786,16 +785,15 @@ void nbackup::restore_database(int filecount, const char* const* files)
|
||||
return;
|
||||
}
|
||||
try {
|
||||
#ifdef WIN_NT
|
||||
if (curLevel)
|
||||
#endif
|
||||
open_backup_scan();
|
||||
break;
|
||||
}
|
||||
catch (const Firebird::Exception& e) {
|
||||
printf("%s\n", e.what());
|
||||
}
|
||||
#ifdef WIN_NT
|
||||
if (curLevel)
|
||||
close_backup();
|
||||
#endif
|
||||
}
|
||||
}
|
||||
else {
|
||||
@ -900,6 +898,9 @@ void nbackup::restore_database(int filecount, const char* const* files)
|
||||
// We are likely to have normal database here
|
||||
delete_database = false;
|
||||
}
|
||||
#ifdef WIN_NT
|
||||
if (curLevel)
|
||||
#endif
|
||||
close_backup();
|
||||
curLevel++;
|
||||
}
|
||||
@ -1062,4 +1063,3 @@ int main( int argc, char *argv[] )
|
||||
|
||||
return EXIT_OK;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user