diff --git a/doc/README.parallel_features b/doc/README.parallel_features index 44ee6fafc19..f08e961c1be 100644 --- a/doc/README.parallel_features +++ b/doc/README.parallel_features @@ -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. diff --git a/doc/README.session_idle_timeouts b/doc/README.session_idle_timeouts index fb3a990e87e..e394fbf5218 100644 --- a/doc/README.session_idle_timeouts +++ b/doc/README.session_idle_timeouts @@ -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 @@ -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. diff --git a/doc/README.statement_timeouts b/doc/README.statement_timeouts index 56f980af31b..34fbd2efb68 100644 --- a/doc/README.statement_timeouts +++ b/doc/README.statement_timeouts @@ -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 diff --git a/doc/sql.extensions/README.builtin_functions.txt b/doc/sql.extensions/README.builtin_functions.txt index 150913ea735..51023228d6d 100644 --- a/doc/sql.extensions/README.builtin_functions.txt +++ b/doc/sql.extensions/README.builtin_functions.txt @@ -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( [, ...] ) @@ -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). @@ -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: @@ -1120,7 +1120,7 @@ Function: Format: RSA_ENCRYPT ( KEY [LPARAM ] [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. @@ -1142,7 +1142,7 @@ Function: Format: RSA_DECRYPT ( KEY [LPARAM ] [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. @@ -1164,7 +1164,7 @@ Function: Format: RSA_SIGN_HASH ( KEY [HASH ] [SALT_LENGTH ] [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. @@ -1186,8 +1186,8 @@ Function: Format: RSA_VERIFY_HASH ( SIGNATURE KEY [HASH ] [SALT_LENGTH ] [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. diff --git a/doc/sql.extensions/README.explicit_locks b/doc/sql.extensions/README.explicit_locks index 22377b007fe..ca0b6e17623 100644 --- a/doc/sql.extensions/README.explicit_locks +++ b/doc/sql.extensions/README.explicit_locks @@ -33,7 +33,7 @@ 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 @@ -41,7 +41,7 @@ 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 @@ -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, @@ -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. diff --git a/doc/sql.extensions/README.identity_columns.txt b/doc/sql.extensions/README.identity_columns.txt index 8bce9143028..e45cd734124 100644 --- a/doc/sql.extensions/README.identity_columns.txt +++ b/doc/sql.extensions/README.identity_columns.txt @@ -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. @@ -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 diff --git a/doc/sql.extensions/README.time_zone.md b/doc/sql.extensions/README.time_zone.md index 4260e719bf7..e18a55f5ec3 100644 --- a/doc/sql.extensions/README.time_zone.md +++ b/doc/sql.extensions/README.time_zone.md @@ -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` @@ -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: `/tzdata` is the default directory where Firebird looks for the database. It could be overriden with the `ICU_TIMEZONE_FILES_DIR` environment variable. +Note: `/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. diff --git a/examples/api/api13.c b/examples/api/api13.c index 4c62dbc4aa3..caaf1715238 100644 --- a/examples/api/api13.c +++ b/examples/api/api13.c @@ -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 \ diff --git a/src/dsql/Nodes.h b/src/dsql/Nodes.h index f92552547b5..5666a947426 100644 --- a/src/dsql/Nodes.h +++ b/src/dsql/Nodes.h @@ -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; diff --git a/src/isql/extract.epp b/src/isql/extract.epp index 55af7d18d32..e677b02807f 100644 --- a/src/isql/extract.epp +++ b/src/isql/extract.epp @@ -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; diff --git a/src/lock/lock.cpp b/src/lock/lock.cpp index 2230c6b478b..ba36601cd9f 100644 --- a/src/lock/lock.cpp +++ b/src/lock/lock.cpp @@ -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. * **************************************/