Menu
▾
▴
[Firebird-checkins] SF.net SVN: firebird:[57973] firebird/trunk
|
From: <asf...@us...> - 2013-04-21 02:09:48
|
Revision: 57973
http://sourceforge.net/p/firebird/code/57973
Author: asfernandes
Date: 2013-04-21 02:09:45 +0000 (Sun, 21 Apr 2013)
Log Message:
-----------
Misc.
Modified Paths:
--------------
firebird/trunk/builds/install/misc/firebird.conf.in
firebird/trunk/doc/README.build.mingw.html
firebird/trunk/doc/README.build.msvc.html
firebird/trunk/doc/README.plugins.html
firebird/trunk/doc/sql.extensions/README.data_types
firebird/trunk/src/common/cvt.cpp
firebird/trunk/src/jrd/ExtEngineManager.cpp
firebird/trunk/src/jrd/jrd.h
Modified: firebird/trunk/builds/install/misc/firebird.conf.in
===================================================================
--- firebird/trunk/builds/install/misc/firebird.conf.in 2013-04-21 01:52:37 UTC (rev 57972)
+++ firebird/trunk/builds/install/misc/firebird.conf.in 2013-04-21 02:09:45 UTC (rev 57973)
@@ -79,7 +79,7 @@
# I.e. when
# include some_file.conf
# is used in /opt/config/master.conf, we include /opt/config/some_file.conf.
-# Traditional wildcards * and ? may be used in icnlude operator. In this case
+# Traditional wildcards * and ? may be used in include operator. In this case
# all matching files will be included in undefined order. Example:
# include $(dir_plugins)/config/*.conf
#
Modified: firebird/trunk/doc/README.build.mingw.html
===================================================================
--- firebird/trunk/doc/README.build.mingw.html 2013-04-21 01:52:37 UTC (rev 57972)
+++ firebird/trunk/doc/README.build.mingw.html 2013-04-21 02:09:45 UTC (rev 57973)
@@ -58,7 +58,7 @@
<ol>
<li>Start msys with the icon.</li>
-<li>Go to the firebird2 root directory. For instance, if your root is d:\svn\firebird you must do cd /d/svn/firebird2.</li>
+<li>Go to the firebird root directory. For instance, if your root is d:\svn\firebird you must do cd /d/svn/firebird.</li>
<li>Start configure with the switches to get super/classic and production/development build, for instance:<br>
autogen.sh --enable-superserver<br>
The valid switches for autogen are<br>
@@ -81,11 +81,11 @@
<h3>4.- INSTALL.</h3>
<p>To create an installable build you need to execute the InnoSetup script.</p>
<ol>
-<li>Open firebird2/builds/install/arch-specific/mingw/super/FirebirdInstall_15.iss with InnoSetup.</li>
+<li>Open firebird/builds/install/arch-specific/mingw/super/FirebirdInstall_15.iss with InnoSetup.</li>
<li>Run the script with F9 or Run->Run</li>
<li>Close InnoSetup</li>
</ol>
-<p>A executable installer will be in firebird2/builds/install/arch-specific/mingw/super/</p>
+<p>A executable installer will be in firebird/builds/install/arch-specific/mingw/super/</p>
<p>To install the build, simply run the resulting exe.</p>
<h3>5.- TROUBLESHOOTING</h3>
Modified: firebird/trunk/doc/README.build.msvc.html
===================================================================
--- firebird/trunk/doc/README.build.msvc.html 2013-04-21 01:52:37 UTC (rev 57972)
+++ firebird/trunk/doc/README.build.msvc.html 2013-04-21 02:09:45 UTC (rev 57973)
@@ -104,7 +104,7 @@
<h4>4.1.-Standard build</h4>
<ol>
-<li>Eliminate the fb2control from firebird2 solution if you are using Visual Studio Express (doesn't support MFC) and it's only the control pannel applet and try to build it, it should give you no errors when you build the solution.</li>
+<li>Eliminate the fb2control from firebird3 solution if you are using Visual Studio Express (doesn't support MFC) and it's only the control pannel applet and try to build it, it should give you no errors when you build the solution.</li>
<li>Open a command line window.</li>
<li>Go to the builds\win32 directory.</li>
<li>Run the following batches in order (your version of VisualStudio is detected automatically)</li>
@@ -115,7 +115,7 @@
</ol>
</ol>
<ul>
-<p>After the build finish, an output directory with the binaries is created below your firebird2 directory.</p>
+<p>After the build finish, an output directory with the binaries is created below your firebird3 directory.</p>
<li>To make a clean build from scratch after making changes to the code use the clean_all.bat script</li>
</ul>
<h4>4.2.-Parser rebuild</h4>
@@ -137,7 +137,7 @@
</ul>
<h4>4.5.-Building samples</h4>
<p>After the standard build is finished, an output directory with the same structure as the installed FB directory is created.</p>
-<p>If you want to build the examples just cd to firebird2\output\examples\build_win32 and run run_all.bat</p>
+<p>If you want to build the examples just cd to firebird3\output\examples\build_win32 and run run_all.bat</p>
<p>Run_all.bat calls four other bats to make the example sets. Any example set can be build independently with its make_XXX script.</p>
<p>The example sets are:</p>
<ul>
Modified: firebird/trunk/doc/README.plugins.html
===================================================================
--- firebird/trunk/doc/README.plugins.html 2013-04-21 01:52:37 UTC (rev 57972)
+++ firebird/trunk/doc/README.plugins.html 2013-04-21 02:09:45 UTC (rev 57973)
@@ -17,13 +17,13 @@
<P STYLE="margin-bottom: 0in"><FONT SIZE=4>Firebird plugins.</FONT></P>
<P STYLE="margin-bottom: 0in"><BR>
</P>
-<P STYLE="margin-bottom: 0in"><FONT SIZE=4>Since version 3 firebird
+<P STYLE="margin-bottom: 0in"><FONT SIZE=4>Since version 3, Firebird
supports plugins architecture. This means that for a number of
-predefined points in firebird code user can write his own fragment of
+predefined points in Firebird code, user can write his own fragment of
code which will be executed when needed. Plugin is not necessarily
-always written be user - firebird already has a number of plugins
-which are it's native part. Moreover, as you will see later, some
-core parts of firebird are implemented as plugins. </FONT>
+always written be user - Firebird already has a number of plugins
+which are its native part. Moreover, as you will see later, some
+core parts of Firebird are implemented as plugins. </FONT>
</P>
<P STYLE="margin-bottom: 0in"><BR>
</P>
@@ -39,7 +39,7 @@
library may contain code for more than one plugin;</FONT></P>
<LI><P STYLE="margin-bottom: 0in"><FONT SIZE=4>plugin's factory - an
object created by that code (pure virtual C++ class), creating
- plugin instances on firebird request;</FONT></P>
+ plugin instances on Firebird request;</FONT></P>
<LI><P STYLE="margin-bottom: 0in"><FONT SIZE=4>instance of plugin,
created by factory.</FONT></P>
</UL>
@@ -49,12 +49,12 @@
<P STYLE="margin-bottom: 0in"><BR>
</P>
<P STYLE="margin-bottom: 0in"><FONT SIZE=4>One should not expect that
-firebird plugin architecture will make it possible to create any kind
+Firebird plugin architecture will make it possible to create any kind
of plugin you want. To be able to have plugin (for example)
-encrypting database on the disk firebird code should be prepared for
+encrypting database on the disk, Firebird code should be prepared for
it – must have a point from which plugin is called. I.e. each
version has a fixed set of plugins which are supported. To add one
-more type first of all firebird code should be modified. What DOES
+more type, first of all Firebird code should be modified. What DOES
our plugin architecture – it helps to make both adding new types of
plugins and writing plugin code simple and as universal between
plugins as possible.</FONT></P>
@@ -71,7 +71,7 @@
<LI><P STYLE="margin-bottom: 0in"><FONT SIZE=4>ExternalEngine
controls use of various engines, see README.external_routines;</FONT></P>
<LI><P STYLE="margin-bottom: 0in"><FONT SIZE=4>Trace plugin is known
- from firebird 2.5, but a way how it interacts with engine was
+ from Firebird 2.5, but a way how it interacts with engine was
changed to match new generic rules; </FONT>
</P>
<LI><P STYLE="margin-bottom: 0in"><FONT SIZE=4>encrypting plugins
@@ -87,8 +87,8 @@
<P STYLE="margin-bottom: 0in"><BR>
</P>
<P STYLE="margin-bottom: 0in"><FONT SIZE=4>Plugins are using a set of
-special firebird interfaces (see README.interfaces about interfaces
-in firebird). All plugin-specific interfaces are reference counted,
+special Firebird interfaces (see README.interfaces about interfaces
+in Firebird). All plugin-specific interfaces are reference counted,
i.e. have explicitly controlled lifetime. Interfaces are declared in
Plugin.h include file. There is a simple example of writing plugin
module – DbCrypt_example. It does not perform any actual encryption
@@ -105,14 +105,14 @@
attention to word “reasonable” - asking a question from plugin
at server's console is hardly good idea;</FONT></P>
<LI><P STYLE="margin-bottom: 0in"><FONT SIZE=4>it's OK to use
- firebird API calls in your plugin if needed (for example, default
- authentication server and user manager are using firebird database
+ Firebird API calls in your plugin if needed (for example, default
+ authentication server and user manager are using Firebird database
to store accounts);</FONT></P>
- <LI><P STYLE="margin-bottom: 0in"><FONT SIZE=4>additionally firebird
+ <LI><P STYLE="margin-bottom: 0in"><FONT SIZE=4>additionally Firebird
provides a set of interfaces, helping you to configure your plugins
(certainly, you are not forced to use them – plugin is generic
code, which may use any way of providing configuration information,
- but with standard tools you get common for the rest of firebird
+ but with standard tools you get common for the rest of Firebird
configuration style and sooner of all save you efforts).</FONT></P>
</UL>
<P STYLE="margin-bottom: 0in"><BR>
@@ -142,7 +142,7 @@
<P STYLE="margin-bottom: 0in"><BR>
</P>
<P STYLE="margin-bottom: 0in"><FONT SIZE=4>As it was already
-mentioned single plugin module may implement more than single plugin.
+mentioned, single plugin module may implement more than single plugin.
Moreover, single plugin may have at the same time more than one
configuration – and for each configuration separate plugin's
factory is created. Each of this 3 objects (module – implementation
@@ -151,7 +151,7 @@
plugin developer and hard-coded inside module. Factory's name by
default equals to plugin implementation's name (and it's factory name
which is actually used in firebird.conf). Certainly in typical
-trivial case module contains one plugin, and that plugin works with
+trivial case, module contains one plugin, and that plugin works with
only one configuration, and all 3 names are equal, and no more
configuration is needed – for example libEngine12.so or
Engine12.dll contains implementation of provider Engine12, and
@@ -159,7 +159,7 @@
</P>
<P STYLE="margin-bottom: 0in"><FONT SIZE=4>Providers = Engine12</FONT></P>
<P STYLE="margin-bottom: 0in"><FONT SIZE=4>in firebird.conf is needed
-to load it. But if you have something complex – file hwill help
+to load it. But if you have something complex – file will help
you to have such plugin factories which you really want.</FONT></P>
<P STYLE="margin-bottom: 0in"><BR>
</P>
@@ -180,14 +180,14 @@
## name of a file, containing plugin's configuration</I></FONT></P>
<P STYLE="margin-bottom: 0in"><FONT SIZE=4><I>}</I></FONT></P>
<P STYLE="margin-bottom: 0in"><FONT SIZE=4>i.e. when plugin PlugName
-is needed firebird loads library LibName, finds in it plugin
+is needed Firebird loads library LibName, finds in it plugin
registered with name RegName and passes it configuration from config
record ConfName or config file ConfFile (config record is used if
-bith are given). Each parameter in this record may be missing, in
+both are given). Each parameter in this record may be missing, in
that case the default PlugName is used. The only exception is
-ConfigFile – by default file with same name as module's dynamic
+ConfigFile – by default, file with same name as module's dynamic
library but .conf extension is used. ConfigFile is expected to have
-format Key=Value (like other firebird configuration files), same
+format Key=Value (like other Firebird configuration files), same
format is used for plugin record:</FONT></P>
<P STYLE="margin-bottom: 0in"><FONT SIZE=4><I>Config = ConfName</I></FONT></P>
<P STYLE="margin-bottom: 0in"><FONT SIZE=4><I>{</I></FONT></P>
@@ -203,8 +203,8 @@
for appropriate client parts), but each vendor calls his plugin
BestCrypt. Certainly, first of all you have to rename libraries to
something like WC1 and WC2 – one can't have 2 files with same name
-in one directory. But after it modules stop to load automatically –
-they are not named BestCrypt any more. To fix it plugins.conf should
+in one directory. But after it, modules stop to load automatically –
+they are not named BestCrypt any more. To fix it, plugins.conf should
contain something like this:</FONT></P>
<P STYLE="margin-bottom: 0in"><FONT SIZE=4><I>Plugin = WC1</I></FONT></P>
<P STYLE="margin-bottom: 0in"><FONT SIZE=4><I>{</I></FONT></P>
@@ -227,7 +227,7 @@
<P STYLE="margin-bottom: 0in"><BR>
</P>
<P STYLE="margin-bottom: 0in"><FONT SIZE=4>Another sample may be
-found in distributed with firebird plugins.conf. One of standard
+found in distributed with Firebird plugins.conf. One of standard
plugins, UDR, is written to use non-default configuration. Therefore
module name and one configuration parameter are given explicitly.</FONT></P>
<P STYLE="margin-bottom: 0in"><BR>
@@ -241,7 +241,7 @@
<P STYLE="margin-bottom: 0in"><FONT SIZE=4>A. That are so-called
'built-in' plugins. They are built into fbclient library, and
therefore are always present. Arrival of such plugins is due to old
-ability to distribute windows firebird client as single dll. It was
+ability to distribute windows Firebird client as single dll. It was
decided to keep such feature at least for a case when standard set of
plugins is used.</FONT></P>
<P STYLE="margin-bottom: 0in"><BR>
@@ -250,7 +250,7 @@
and Arc4 plugins mean?</FONT></P>
<P STYLE="margin-bottom: 0in"><FONT SIZE=4>A. Srp implements Secure
Remote Passwords protocol which is default way of authenticating
-users in firebird 3. It has efficient password’s length equal to 20
+users in Firebird 3. It has efficient password’s length equal to 20
bytes, resistant to most of attacks (including man in the middle) and
does not require exchanging any keys between client and server to
work. Arc4 means Alleged RC4 - an implementation of RC4 cypher. The
Modified: firebird/trunk/doc/sql.extensions/README.data_types
===================================================================
--- firebird/trunk/doc/sql.extensions/README.data_types 2013-04-21 01:52:37 UTC (rev 57972)
+++ firebird/trunk/doc/sql.extensions/README.data_types 2013-04-21 02:09:45 UTC (rev 57973)
@@ -55,7 +55,7 @@
2. CREATE TABLE TABLE1 (FIELD1 BOOLEAN);
Note(s):
- 1. Quote from the SQL-99 specification:
+ 1. Quote from the SQL-2008 specification:
The data type boolean comprises the distinct truth values TRUE and FALSE. Unless prohibited
by a NOT NULL constraint, the boolean data type also supports the truth value UNKNOWN as the
Modified: firebird/trunk/src/common/cvt.cpp
===================================================================
--- firebird/trunk/src/common/cvt.cpp 2013-04-21 01:52:37 UTC (rev 57972)
+++ firebird/trunk/src/common/cvt.cpp 2013-04-21 02:09:45 UTC (rev 57973)
@@ -1449,8 +1449,10 @@
ptr += sizeof(USHORT);
if (l < from->dsc_length)
+ {
cb->err(Arg::Gds(isc_arith_except) << Arg::Gds(isc_string_truncation) <<
Arg::Gds(isc_trunc_limits) << Arg::Num(l) << Arg::Num(from->dsc_length));
+ }
Jrd::CharSet* charSet = cb->getToCharset(to->getCharSet());
cb->validateData(charSet, from->dsc_length, from->dsc_address);
Modified: firebird/trunk/src/jrd/ExtEngineManager.cpp
===================================================================
--- firebird/trunk/src/jrd/ExtEngineManager.cpp 2013-04-21 01:52:37 UTC (rev 57972)
+++ firebird/trunk/src/jrd/ExtEngineManager.cpp 2013-04-21 02:09:45 UTC (rev 57973)
@@ -449,8 +449,8 @@
return request->req_rpb.getCount() > n && request->req_rpb[n].rpb_number.isValid() ?
&request->req_rpb[n] : NULL;
}
-
+
private:
const ExtEngineManager::Trigger* trigger;
};
Modified: firebird/trunk/src/jrd/jrd.h
===================================================================
--- firebird/trunk/src/jrd/jrd.h 2013-04-21 01:52:37 UTC (rev 57972)
+++ firebird/trunk/src/jrd/jrd.h 2013-04-21 02:09:45 UTC (rev 57973)
@@ -831,7 +831,7 @@
/*-------------------------------------------------------------------------*
* macros used to set thread_db and Database pointers when there are not set already *
*-------------------------------------------------------------------------*/
-inline void SET_TDBB(Jrd::thread_db* &tdbb)
+inline void SET_TDBB(Jrd::thread_db*& tdbb)
{
if (tdbb == NULL) {
tdbb = JRD_get_thread_data();
@@ -839,7 +839,7 @@
CHECK_TDBB(tdbb);
}
-inline void SET_DBB(Jrd::Database* &dbb)
+inline void SET_DBB(Jrd::Database*& dbb)
{
if (dbb == NULL) {
dbb = GET_DBB();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
