firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-24 08:03:03 +01:00
Code Issues

Misc

Browse Source
This commit is contained in:
asfernandes 2008-02-10 17:26:35 +00:00
parent 93d444523f
commit 4ffcaa7c5b
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/jrd/jrd.cpp
View File

@ -284,8 +284,8 @@ namespace
}; };
// shuts SecurityDatabase in case of errors during attach or create // Shuts SecurityDatabase in case of errors during attach or create.
// when attachment is created, control is passed to it using clear // When attachment is created, control is passed to it using clear
class SecurityInitHolder class SecurityInitHolder
{ {
public: public:
@ -813,11 +813,12 @@ ISC_STATUS GDS_ATTACH_DATABASE(ISC_STATUS* user_status,
LCK_init(tdbb, LCK_OWNER_attachment); // For the attachment LCK_init(tdbb, LCK_OWNER_attachment); // For the attachment
attachment->att_flags |= ATT_lck_init_done; attachment->att_flags |= ATT_lck_init_done;
if (dbb->dbb_filename.empty()) if (dbb->dbb_filename.empty())
{ {
#if defined(DEV_BUILD) && defined(SUPERSERVER) #if defined(DEV_BUILD) && defined(SUPERSERVER)
// make sure we do not reopen same DB twice // make sure we do not reopen same DB twice
for (Database* d=databases; d; d = d->dbb_next) for (Database* d = databases; d; d = d->dbb_next)
{ {
if (d->dbb_filename == expanded_name) if (d->dbb_filename == expanded_name)
{ {
@ -1692,7 +1693,7 @@ ISC_STATUS GDS_CREATE_DATABASE(ISC_STATUS* user_status,
options.dpb_sql_dialect = 0; options.dpb_sql_dialect = 0;
} }
// Ccheck for correct credentials supplied // Check for correct credentials supplied
getUserInfo(userId, options); getUserInfo(userId, options);
} }
catch (const Firebird::Exception& e) catch (const Firebird::Exception& e)
@ -2122,7 +2123,7 @@ ISC_STATUS GDS_DETACH(ISC_STATUS* user_status, Attachment** handle)
Attachment* attachment = *handle; Attachment* attachment = *handle;
validateHandle(tdbb, attachment); validateHandle(tdbb, attachment);
{ // holder scope { // holder scope
DatabaseContextHolder dbbHolder(tdbb); DatabaseContextHolder dbbHolder(tdbb);