Post-merge corrections: typo in doc, error messages, fixed error.

Thanks to Adriano for review.

Author: hvlad

doc/sql.extensions/README.index_concurrently.md

@@ -83,7 +83,7 @@ create unique index on column with duplicates
 
 	create unique index idx_tab_id on tab(id);
 
-it trows an error:
+it throws an error:
 
 	Statement failed, SQLSTATE = 23000
 	attempt to store duplicate value (visible to active transactions) in unique index "IDX_TAB_ID"

src/dsql/DdlNodes.epp

@@ -13069,15 +13069,18 @@ void ModifyIndexNode::validateUniqueIndex(thread_db* tdbb, jrd_tra* transaction,
 				IDX.RDB$INDEX_NAME EQ indexName.object.c_str()
 		{
 			if (IDX.RDB$INDEX_INACTIVE != 0)
-				status_exception::raise(Arg::Gds(isc_random) << "Can't validate inactive index");
+				status_exception::raise(Arg::Gds(isc_dyn_index_cant_validate_inactive));
+				// msg 328: "Can't validate inactive index"
 
 			if (IDX.RDB$UNIQUE_FLAG.NULL || !(IDX.RDB$UNIQUE_FLAG & IDX_UNIQUE))
-				status_exception::raise(Arg::Gds(isc_random) << "Can't validate non-unique index");
+				status_exception::raise(Arg::Gds(isc_dyn_index_cant_validate_non_unique));
+				// msg 329: "Can't validate non-unique index"
 
 			fb_assert(IDX.RDB$UNIQUE_FLAG & IDX_UNIQUE);
 
 			if (!(IDX.RDB$UNIQUE_FLAG & IDX_NOT_VALIDATED))
-				status_exception::raise(Arg::Gds(isc_random) << "Index uniqueness already validated");
+				status_exception::raise(Arg::Gds(isc_dyn_index_already_validated));
+				// msg 330: "Index uniqueness already validated"
 
 			const MetaId idxId = IDX.RDB$INDEX_ID - 1;
 
@@ -13098,16 +13101,15 @@ void ModifyIndexNode::validateUniqueIndex(thread_db* tdbb, jrd_tra* transaction,
 	{
 		Arg::StatusVector err(ex);
 
-		string msg;
-		msg.printf("Validation of unique index %s failed.", indexName.toQuotedString().c_str());
-
 		if (!silent)
 		{
-			err.prepend(Arg::Gds(isc_no_meta_update) << Arg::Gds(isc_random) << msg);
+			err.prepend(Arg::Gds(isc_no_meta_update) << Arg::Gds(isc_dyn_index_validation_failed) <<
+				indexName.toQuotedString());
 			ERR_post(err);
 		}
 
-		err.prepend(Arg::Warning(isc_random) << msg);
+		// msg 331: "Uniqueness validation of the index @1 failed"
+		err.prepend(Arg::Warning(isc_dyn_index_validation_failed) << indexName.toQuotedString());
 		ERR_post_warning(err);
 	}
 }

src/include/firebird/impl/msg/dyn.h

@@ -317,3 +317,7 @@ FB_IMPL_MSG_SYMBOL(DYN, 324, dyn_constant_not_found, "Constant @1 not found")
 FB_IMPL_MSG_SYMBOL(DYN, 325, dyn_dup_const, "Constant @1 already exists")
 FB_IMPL_MSG_SYMBOL(DYN, 326, dyn_non_constant_constant, "The constant @1 must be initialized by a constant expression")
 FB_IMPL_MSG(DYN, 327, dyn_function_mismatch, -104, "42", "000", "Function @1 cannot change between aggregate and non-aggregate")
+FB_IMPL_MSG_SYMBOL(DYN, 328, dyn_index_cant_validate_inactive, "Can't validate inactive index")
+FB_IMPL_MSG_SYMBOL(DYN, 329, dyn_index_cant_validate_non_unique, "Can't validate non-unique index")
+FB_IMPL_MSG_SYMBOL(DYN, 330, dyn_index_already_validated, "Index uniqueness already validated")
+FB_IMPL_MSG_SYMBOL(DYN, 331, dyn_index_validation_failed, "Uniqueness validation of the index @1 failed")

src/jrd/dfw.epp

@@ -547,7 +547,7 @@ void Jrd::ProtectRelations::relLock::releaseLock(thread_db* tdbb, jrd_tra* trans
 		m_lock->lck_logical = m_level;
 		LCK_downgrade(tdbb, m_lock);
 	}
-	else
+	else if (m_lock)
 		LCK_release(tdbb, m_lock);
 }
 

src/jrd/idx.cpp

@@ -1993,7 +1993,7 @@ bool IDX_validate_unique(thread_db* tdbb, jrd_rel* relation, MetaId id)
 				for (RecordStack::iterator rec(stack); rec.hasData(); ++rec)
 				{
 					if (cmpRecordKeys(tdbb, rec.object(), relation, index,
-						rpb.rpb_record, relation, index))
+									  rpb.rpb_record, relation, index))
 					{
 						IndexErrorContext context(relation, index);
 						context.raise(tdbb, idx_e_duplicate, rpb.rpb_record);