Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion doc/README.parallel_features
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ DPB have higher priority than setting in firebird.conf.
there are two new settings in firebird.conf:
- ParallelWorkers - set default number of parallel workers that used by user
attachments.
Could be overriden by attachment using tag isc_dpb_parallel_workers in DPB.
Could be overridden by attachment using tag isc_dpb_parallel_workers in DPB.
- MaxParallelWorkers - limit number of simultaneously used workers for the
given database and Firebird process.

Expand Down
6 changes: 3 additions & 3 deletions doc/README.session_idle_timeouts
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ easy replacement of self-made control for the connection life time.
as few hours. By default it is not enabled.

The feature works as below
- when user API call leaves engine, special idle timer assotiated with current connection
- when user API call leaves engine, special idle timer associated with current connection
is started
- when user API call enters engine, idle timer is stopped
- when idle time is fired engine immediately closes the connection in the same way as
with asyncronous connection cancellation:
with asynchronous connection cancellation:
- all active statements and cursors are closed
- all active transactions are rolled back
- network connection is not closed at this moment. It allows client application to get
Expand All @@ -37,7 +37,7 @@ as few hours. By default it is not enabled.
as:
- if not set at connection level, look at database level
- in any case can't be greater than value set at database level
i.e. value of idle timeout could be overriden by application developer at given
i.e. value of idle timeout could be overridden by application developer at given
connection but it can't relax limit set by DBA (in config)
- zero timeout means no timeout, i.e. idle timer will not start
- while idle timeout is set in seconds at API level, we can't promise absolute precision.
Expand Down
2 changes: 1 addition & 1 deletion doc/README.statement_timeouts
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ stop execution of SQL statement when it running longer than given timeout value.
- if not set at statement level, look at connection level
- if not set at connection level, look at database level
- in any case can't be greater than value set at database level
i.e. value of statement timeout could be overriden by application developer at lower
i.e. value of statement timeout could be overridden by application developer at lower
scope but it can't relax limit set by DBA (in config)
- zero timeout means no timeout, i.e. timer will not start
- while statement timeout is set in milliseconds at API level, we can't promise
Expand Down
16 changes: 8 additions & 8 deletions doc/sql.extensions/README.builtin_functions.txt
Original file line number Diff line number Diff line change
Expand Up @@ -653,7 +653,7 @@ LEAST
-----

Function:
Returns the minimun value of a list of values.
Returns the minimum value of a list of values.

Format:
LEAST( <value> [, <value> ...] )
Expand Down Expand Up @@ -786,7 +786,7 @@ Notes:
If ppnum is specified, then dpnum could be negative.
If ppnum is missing and dpnum is negative then NULL is returned.
7) If any of specified arguments has NULL value, the result is also NULL.
8) First argument (relation) is described as INTEGER but could be overriden
8) First argument (relation) is described as INTEGER but could be overridden
by application as VARCHAR or CHAR.
recnum, dpnum and ppnum are described as BIGINT (64-bit signed integer).

Expand Down Expand Up @@ -994,7 +994,7 @@ REPLACE
-------

Function:
REPLACE(searched, find, replacement) replaces all occurences of "find"
REPLACE(searched, find, replacement) replaces all occurrences of "find"
in "searched" by "replacement".

Format:
Expand Down Expand Up @@ -1120,7 +1120,7 @@ Function:

Format:
RSA_ENCRYPT ( <string> KEY <public key> [LPARAM <string>] [HASH <hash>] [PKCS_1_5] )
KEY should be a value, returhed by RSA_PUBLIC function.
KEY should be a value, returned by RSA_PUBLIC function.
LPARAM is an additional system specific tag that can be applied to identify which
system encoded the message. Default value is NULL.
hash ::= { MD5 | SHA1 | SHA256 | SHA512 } Default is SHA256.
Expand All @@ -1142,7 +1142,7 @@ Function:

Format:
RSA_DECRYPT ( <string> KEY <private key> [LPARAM <string>] [HASH <hash>] [PKCS_1_5] )
KEY should be a value, returhed by RSA_PRIVATE function.
KEY should be a value, returned by RSA_PRIVATE function.
LPARAM is the same variable passed to RSA_ENCRYPT. If it does not match
what was used during encoding this function will not decrypt the packet.
hash ::= { MD5 | SHA1 | SHA256 | SHA512 } Default is SHA256.
Expand All @@ -1164,7 +1164,7 @@ Function:

Format:
RSA_SIGN_HASH ( <string> KEY <private key> [HASH <hash>] [SALT_LENGTH <smallint>] [PKCS_1_5] )
KEY should be a value, returhed by RSA_PRIVATE function.
KEY should be a value, returned by RSA_PRIVATE function.
hash ::= { MD5 | SHA1 | SHA256 | SHA512 } Default is SHA256.
SALT_LENGTH indicates the length of the desired salt, and should typically be small.
A good value is between 8 and 16.
Expand All @@ -1186,8 +1186,8 @@ Function:

Format:
RSA_VERIFY_HASH ( <string> SIGNATURE <string> KEY <public key> [HASH <hash>] [SALT_LENGTH <smallint>] [PKCS_1_5] )
SIGNATURE should be a value, returhed by RSA_SIGN function.
KEY should be a value, returhed by RSA_PUBLIC function.
SIGNATURE should be a value, returned by RSA_SIGN function.
KEY should be a value, returned by RSA_PUBLIC function.
hash ::= { MD5 | SHA1 | SHA256 | SHA512 } Default is SHA256.
SALT_LENGTH indicates the length of the desired salt, and should typically be small.
A good value is between 8 and 16.
Expand Down
8 changes: 4 additions & 4 deletions doc/sql.extensions/README.explicit_locks
Original file line number Diff line number Diff line change
Expand Up @@ -33,15 +33,15 @@ parameters specified in the TPB block.

TPB mode Behavior
-------------------------------------------------------------
isc_tpb_consistency Explicit locks are overriden by
isc_tpb_consistency Explicit locks are overridden by
implicit or explicit table-level locks
and are ignored

isc_tpb_concurrency + If record is modified by any committed
isc_tpb_nowait transaction since transaction attempting
to get explicit lock started or there is
active transaction that performed
modifiction of this record, update
modification of this record, update
conflict exception is raised immediately

isc_tpb_concurrency + If record is modified by any committed
Expand All @@ -51,7 +51,7 @@ isc_tpb_wait transaction since transaction attempting
If there is active transaction holding ownership
on this record (via explicit lock or normal update)
locking transaction waits for outcome of
blocking transation and when it finishes
blocking transaction and when it finishes
attempts to get lock on record again.
This means that if blocking transaction
commits modification of this record,
Expand All @@ -64,7 +64,7 @@ isc_tpb_nowait on this record (via explicit lock or normal update),
isc_tpb_read_committed + If there is active transaction holding ownership
isc_tpb_wait on this record (via explicit lock or normal update),
locking transaction waits for outcome of
blocking transation and when it finishes
blocking transaction and when it finishes
attempts to get lock on record again.
Update conflict exceptions can never be raised
by this kind of explicit lock statement.
Expand Down
4 changes: 2 additions & 2 deletions doc/sql.extensions/README.identity_columns.txt
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ Syntax rules:
- Identity columns can't have DEFAULT or COMPUTED value.

Notes:
- You cannot alter a identity column to normal column and vice versa.
- You cannot alter an identity column to normal column and vice versa.
- Identity columns are implicitly NOT NULL.
- Identity columns don't enforce uniqueness automatically. Use UNIQUE or PRIMARY key for that.
- Increment value cannot be 0.
Expand Down Expand Up @@ -92,7 +92,7 @@ alter table objects
Override Clause
---------------

BY DEFAULT identity columns can be overriden in INSERT statements (INSERT, UPDATE OR INSERT, MERGE ... WHEN NOT MATCHED)
BY DEFAULT identity columns can be overridden in INSERT statements (INSERT, UPDATE OR INSERT, MERGE ... WHEN NOT MATCHED)
just specifying the value in the values list. However, for ALWAYS identity columns that is not allowed.

To use the value passed in the INSERT statement for an ALWAYS column, you should pass OVERRIDING SYSTEM VALUE as
Expand Down
4 changes: 2 additions & 2 deletions doc/sql.extensions/README.time_zone.md
Original file line number Diff line number Diff line change
Expand Up @@ -354,7 +354,7 @@ set time zone '-3:00';

In version 4.0, `CURRENT_TIME` and `CURRENT_TIMESTAMP` are changed to return `TIME WITH TIME ZONE` and `TIMESTAMP WITH TIME ZONE` (with time zone set to the session time zone), different than previous versions, that returned the types without time zone.

To make transition easier, `LOCALTIME` and `LOCALTIMESTAMP` was added in v3.0.4, so applications can be adjusted in v3 and migrated to v4 without funcional changes.
To make transition easier, `LOCALTIME` and `LOCALTIMESTAMP` was added in v3.0.4, so applications can be adjusted in v3 and migrated to v4 without functional changes.

## Virtual table `RDB$TIME_ZONES`

Expand Down Expand Up @@ -432,7 +432,7 @@ An updated database can be found in [this Firebird's GitHub page](https://github

The content of the zip file must be extracted in the `tzdata` subdirectory of Firebird's root, overwriting the others `*.res` files of the old database.

Note: `<firebird root>/tzdata` is the default directory where Firebird looks for the database. It could be overriden with the `ICU_TIMEZONE_FILES_DIR` environment variable.
Note: `<firebird root>/tzdata` is the default directory where Firebird looks for the database. It could be overridden with the `ICU_TIMEZONE_FILES_DIR` environment variable.

Important note: Firebird stores `WITH TIME ZONE` values translated to UTC time. If a value is created with one time zone database and later that database is updated and the update changes the information in the range of a stored value, when reading that value it will be returned as a different value than the one initially stored.

Expand Down
2 changes: 1 addition & 1 deletion examples/api/api13.c
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ int main (int argc, char** argv)
}

/*
* Change all corresponding occurences of the string in database 2.
* Change all corresponding occurrences of the string in database 2.
*/

sprintf(buf, "UPDATE cross_rate SET from_currency = '%s' WHERE \
Expand Down
2 changes: 1 addition & 1 deletion src/dsql/Nodes.h
Original file line number Diff line number Diff line change
Expand Up @@ -812,7 +812,7 @@ class ValueExprNode : public ExprNode
return isSharedNode() ? nullptr : &dsqlDesc;
}

// Must be overriden returning true in shared nodes.
// Must be overridden returning true in shared nodes.
virtual bool isSharedNode()
{
return false;
Expand Down
2 changes: 1 addition & 1 deletion src/isql/extract.epp
Original file line number Diff line number Diff line change
Expand Up @@ -399,7 +399,7 @@ int EXTRACT_list_table(const SCHAR* relation_name,
if ((FLD.RDB$FIELD_TYPE == blr_text || FLD.RDB$FIELD_TYPE == blr_varying) &&
!RFR.RDB$COLLATION_ID.NULL)
{
// There is no need to print character set for domain at all because it cannot be overriden.
// There is no need to print character set for domain at all because it cannot be overridden.
// Collation will be printed later.
collation = RFR.RDB$COLLATION_ID;
char_set_id = FLD.RDB$CHARACTER_SET_ID;
Expand Down
2 changes: 1 addition & 1 deletion src/lock/lock.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -804,7 +804,7 @@ bool LockManager::cancelWait(SRQ_PTR owner_offset)
*
* Functional description
* Wakeup waiting owner to make it check if wait should be cancelled.
* As this routine could be called asyncronous, take extra care and
* As this routine could be called asynchronous, take extra care and
* don't trust the input params blindly.
*
**************************************/
Expand Down
Loading