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

Misc.

Browse Source
This commit is contained in:
asfernandes 2013-12-25 23:36:56 +00:00
parent 2e7ca28cce
commit 7bb6f550ee
5 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/dsql/DdlNodes.epp
View File

@ -9191,10 +9191,10 @@ void CreateAlterUserNode::execute(thread_db* tdbb, DsqlCompilerScratch* dsqlScra
// alter current user
UserId* usr = tdbb->getAttachment()->att_user;
fb_assert(usr);
if (!usr)
{
(Arg::Gds(isc_random) << "Missing user name for ALTER CURRENT USER").raise();
}
text = usr->usr_user_name;
}
text.upper();

2
src/jrd/UserManagement.cpp
View File

@ -289,6 +289,7 @@ void UserManagement::execute(USHORT id)
merge(merged, cur);
++cur;
}
while (old != oldEnd)
{
merge(merged, old);
@ -440,6 +441,7 @@ RecordBuffer* UserManagement::getList(thread_db* tdbb, jrd_rel* relation)
private:
UserManagement* userManagement;
};
FillSnapshot fillSnapshot(this);
LocalStatus status;

2
src/jrd/btr.cpp
View File

@ -555,7 +555,7 @@ static void checkForLowerKeySkip(bool& skipLowerKey,
else
{
// Check if we have a duplicate node (for the same page)
if (node.prefix < lower.key_length)
if (node.prefix < lower.key_length)
{
if (node.prefix + node.length == lower.key_length)
skipLowerKey = (memcmp(node.data, lower.key_data + node.prefix, node.length) == 0);

6
src/jrd/recsrc/IndexTableScan.cpp
View File

@ -520,9 +520,9 @@ UCHAR* IndexTableScan::openStream(thread_db* tdbb, Impure* impure, win* window)
{
UCHAR* pointer = NULL;
// If END_BUCKET is reached BTR_find_leaf will return NULL
while (!(pointer = BTR_find_leaf(page, limit_ptr, impure->irsb_nav_data, NULL,
(idx->idx_flags & idx_descending),
(retrieval->irb_generic & (irb_starting | irb_partial)) )))
while (!(pointer = BTR_find_leaf(page, limit_ptr, impure->irsb_nav_data, NULL,
(idx->idx_flags & idx_descending),
(retrieval->irb_generic & (irb_starting | irb_partial)))))
{
page = (Ods::btree_page*) CCH_HANDOFF(tdbb, window, page->btr_sibling,
LCK_read, pag_index);

2
src/utilities/fbsvcmgr/fbsvcmgr.cpp
View File

@ -609,8 +609,10 @@ const char* capArray[] = {
void printCapabilities(const char*& p)
{
printMessage(57);
int caps = getNumeric(p);
bool print = false;
for (unsigned i = 0; capArray[i]; ++i)
{
if (caps & (1 << i))