Menu
▾
▴
[Firebird-checkins] SF.net SVN: firebird:[62582] firebird/trunk
|
From: <asf...@us...> - 2015-11-18 01:10:11
|
Revision: 62582
http://sourceforge.net/p/firebird/code/62582
Author: asfernandes
Date: 2015-11-18 01:10:08 +0000 (Wed, 18 Nov 2015)
Log Message:
-----------
Misc.
Modified Paths:
--------------
firebird/trunk/builds/install/arch-specific/win32/installation_readme.txt
firebird/trunk/src/common/classes/alloc.cpp
firebird/trunk/src/common/os/os_utils.h
firebird/trunk/src/dsql/ExprNodes.cpp
firebird/trunk/src/dsql/parse.y
firebird/trunk/src/jrd/trace/TraceConfigStorage.cpp
firebird/trunk/src/jrd/trace/TraceManager.cpp
firebird/trunk/src/jrd/trace/TraceObjects.h
firebird/trunk/src/remote/inet.cpp
firebird/trunk/src/yvalve/MasterImplementation.cpp
Modified: firebird/trunk/builds/install/arch-specific/win32/installation_readme.txt
===================================================================
--- firebird/trunk/builds/install/arch-specific/win32/installation_readme.txt 2015-11-18 00:42:32 UTC (rev 62581)
+++ firebird/trunk/builds/install/arch-specific/win32/installation_readme.txt 2015-11-18 01:10:08 UTC (rev 62582)
@@ -47,15 +47,15 @@
Firebird 3 no longer needs to deploy the MSVC runtimes
into the windows system directories so no redistributable
-run-timme package is deployed. Firebird 3.0 loads the runtime
-libraries from the root installation directory.
+run-time package is deployed. Firebird 3.0 loads the runtime
+libraries from the root installation directory.
Deployment of gds32.dll
-----------------------
This compatibility library is no longer deployed into
-then windows system directory by default. We cannot
+the windows system directory by default. We cannot
guarantee that the required MSVC runtimes will be
available. However it remains an option at install
time, along with system deployment of fbclient.dll.
@@ -64,7 +64,7 @@
appropriate MSVC10 runtimes if you use these options.
-Installation of the Guardian
+Installation of the Guardian
----------------------------
We are hoping to phase out the Guardian. It doesn't
@@ -112,7 +112,7 @@
o Be sure to install as an administrator. ie, if
using the binary installer right click and choose
'Run as administrator'. Otherwise the installer
- may be unable to start the Firebird service at
+ may be unable to start the Firebird service at
the end of installation.
o Libraries deployed by instclient may fail to load if
Modified: firebird/trunk/src/common/classes/alloc.cpp
===================================================================
--- firebird/trunk/src/common/classes/alloc.cpp 2015-11-18 00:42:32 UTC (rev 62581)
+++ firebird/trunk/src/common/classes/alloc.cpp 2015-11-18 01:10:08 UTC (rev 62582)
@@ -1441,7 +1441,7 @@
full_size = Limits::getSize(slot);
FreeObjPtr blk = ListBuilder::getElement(&freeObjects[slot]);
- if ((!blk) && from)
+ if (!blk && from)
{
for (unsigned slot1 = slot - 1; Limits::getSize(slot1) >= from; --slot1)
{
@@ -1805,13 +1805,13 @@
MemPool::MemPool()
- : pool_destroying(false), parent_redirect(false), stats(MemoryPool::default_stats_group), parent(NULL)
+ : pool_destroying(false), parent_redirect(false), stats(MemoryPool::default_stats_group), parent(NULL)
{
initialize();
}
MemPool::MemPool(MemPool& p, MemoryStats& s)
- : pool_destroying(false), parent_redirect(true), stats(&s), parent(&p)
+ : pool_destroying(false), parent_redirect(true), stats(&s), parent(&p)
{
initialize();
}
@@ -2556,4 +2556,3 @@
return MemoryPool::globalAlloc(s ALLOC_ARGS);
}
#endif // DEBUG_GDS_ALLOC
-
Modified: firebird/trunk/src/common/os/os_utils.h
===================================================================
--- firebird/trunk/src/common/os/os_utils.h 2015-11-18 00:42:32 UTC (rev 62581)
+++ firebird/trunk/src/common/os/os_utils.h 2015-11-18 01:10:08 UTC (rev 62582)
@@ -77,7 +77,7 @@
CtrlCHandler();
~CtrlCHandler();
- bool getTerminated() const
+ bool getTerminated() const
{
return terminated;
}
Modified: firebird/trunk/src/dsql/ExprNodes.cpp
===================================================================
--- firebird/trunk/src/dsql/ExprNodes.cpp 2015-11-18 00:42:32 UTC (rev 62581)
+++ firebird/trunk/src/dsql/ExprNodes.cpp 2015-11-18 01:10:08 UTC (rev 62582)
@@ -6156,28 +6156,28 @@
return &impure->vlu_desc;
}
- SLONG int32_result = 0;
- SINT64 int64_result = 0;
+ SLONG result32 = 0;
+ SINT64 result64 = 0;
switch (infoType)
{
case INFO_TYPE_CONNECTION_ID:
- int64_result = PAG_attachment_id(tdbb);
+ result64 = PAG_attachment_id(tdbb);
break;
case INFO_TYPE_TRANSACTION_ID:
- int64_result = tdbb->getTransaction()->tra_number;
+ result64 = tdbb->getTransaction()->tra_number;
break;
case INFO_TYPE_GDSCODE:
- int32_result = request->req_last_xcp.as_gdscode();
+ result32 = request->req_last_xcp.as_gdscode();
break;
case INFO_TYPE_SQLCODE:
- int32_result = request->req_last_xcp.as_sqlcode();
+ result32 = request->req_last_xcp.as_sqlcode();
break;
case INFO_TYPE_ROWS_AFFECTED:
- int64_result = request->req_records_affected.getCount();
+ result64 = request->req_records_affected.getCount();
break;
case INFO_TYPE_TRIGGER_ACTION:
- int32_result = request->req_trigger_action;
+ result32 = request->req_trigger_action;
break;
default:
BUGCHECK(232); // msg 232 EVL_expr: invalid operation
@@ -6185,10 +6185,10 @@
dsc desc;
- if (int64_result)
- desc.makeInt64(0, &int64_result);
+ if (result64)
+ desc.makeInt64(0, &result64);
else
- desc.makeLong(0, &int32_result);
+ desc.makeLong(0, &result32);
EVL_make_value(tdbb, &desc, impure);
return &impure->vlu_desc;
Modified: firebird/trunk/src/dsql/parse.y
===================================================================
--- firebird/trunk/src/dsql/parse.y 2015-11-18 00:42:32 UTC (rev 62581)
+++ firebird/trunk/src/dsql/parse.y 2015-11-18 01:10:08 UTC (rev 62582)
@@ -836,7 +836,7 @@
$node->grantAdminOption = $7;
$node->grantor = $8;
}
-/*
+ /***
| usage_privilege(NOTRIAL(&$node->privileges)) ON KW_DOMAIN symbol_domain_name
TO non_role_grantee_list(NOTRIAL(&$node->users)) grant_option granted_by
{
@@ -858,7 +858,7 @@
$node->grantAdminOption = $7;
$node->grantor = $8;
}
-*/
+ ***/
| ddl_privileges(NOTRIAL(&$node->privileges)) object
TO non_role_grantee_list(NOTRIAL(&$node->users)) grant_option granted_by
{
@@ -1093,7 +1093,7 @@
$node->grantAdminOption = $1;
$node->grantor = $8;
}
-/*
+ /***
| rev_grant_option usage_privilege(NOTRIAL(&$node->privileges)) ON KW_DOMAIN symbol_domain_name
FROM non_role_grantee_list(NOTRIAL(&$node->users)) granted_by
{
@@ -1115,7 +1115,7 @@
$node->grantAdminOption = $1;
$node->grantor = $8;
}
-*/
+ ***/
| rev_grant_option ddl_privileges(NOTRIAL(&$node->privileges)) object
FROM non_role_grantee_list(NOTRIAL(&$node->users)) granted_by
{
Modified: firebird/trunk/src/jrd/trace/TraceConfigStorage.cpp
===================================================================
--- firebird/trunk/src/jrd/trace/TraceConfigStorage.cpp 2015-11-18 00:42:32 UTC (rev 62581)
+++ firebird/trunk/src/jrd/trace/TraceConfigStorage.cpp 2015-11-18 01:10:08 UTC (rev 62582)
@@ -162,6 +162,7 @@
m_sharedMemory->removeMapFile();
}
}
+
m_sharedMemory = NULL;
}
Modified: firebird/trunk/src/jrd/trace/TraceManager.cpp
===================================================================
--- firebird/trunk/src/jrd/trace/TraceManager.cpp 2015-11-18 00:42:32 UTC (rev 62581)
+++ firebird/trunk/src/jrd/trace/TraceManager.cpp 2015-11-18 01:10:08 UTC (rev 62582)
@@ -163,6 +163,7 @@
init_factories = false;
}
}
+
getStorage()->shutdown();
}
Modified: firebird/trunk/src/jrd/trace/TraceObjects.h
===================================================================
--- firebird/trunk/src/jrd/trace/TraceObjects.h 2015-11-18 00:42:32 UTC (rev 62581)
+++ firebird/trunk/src/jrd/trace/TraceObjects.h 2015-11-18 01:10:08 UTC (rev 62582)
@@ -620,10 +620,10 @@
m_perf = perf;
}
- ISC_INT64 getOIT() { return m_oit; };
- ISC_INT64 getOST() { return m_ost; };
- ISC_INT64 getOAT() { return m_oat; };
- ISC_INT64 getNext() { return m_next; };
+ ISC_INT64 getOIT() { return m_oit; };
+ ISC_INT64 getOST() { return m_ost; };
+ ISC_INT64 getOAT() { return m_oat; };
+ ISC_INT64 getNext() { return m_next; };
PerformanceInfo* getPerf() { return m_perf; };
private:
Modified: firebird/trunk/src/remote/inet.cpp
===================================================================
--- firebird/trunk/src/remote/inet.cpp 2015-11-18 00:42:32 UTC (rev 62581)
+++ firebird/trunk/src/remote/inet.cpp 2015-11-18 01:10:08 UTC (rev 62582)
@@ -914,7 +914,7 @@
* binds the socket and calls listen().
* For multi-client server (SuperServer or SuperClassic) return listener
* port.
- * For classic server - accept incoming connections and fork worker
+ * For classic server - accept incoming connections and fork worker
* processes, return NULL at exit;
* On error throw exception.
*
Modified: firebird/trunk/src/yvalve/MasterImplementation.cpp
===================================================================
--- firebird/trunk/src/yvalve/MasterImplementation.cpp 2015-11-18 00:42:32 UTC (rev 62581)
+++ firebird/trunk/src/yvalve/MasterImplementation.cpp 2015-11-18 01:10:08 UTC (rev 62582)
@@ -250,7 +250,7 @@
// count of fbclient.dll. If application unload fbclient.dll not calling
// fb_shutdown, then last unloaded plugin will finally unload fbclient.dll
// and the code that is currently running, leading to AV.
- // To prevent such scenario we increment usage count of fbclient.dll and
+ // To prevent such scenario we increment usage count of fbclient.dll and
// will decrement it in safe way at the end of the timer thread.
char buff[MAX_PATH];
@@ -258,7 +258,7 @@
HMODULE hDll = LoadLibrary(buff);
#endif
- while (stopTimerThread.value() == 0
+ while (stopTimerThread.value() == 0
#ifdef WIN_NT
&& Firebird::dDllUnloadTID == 0
#endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
