Restore the original error for isc_tpb_[no_]rec_version version specified without isc_tpb_read_committed

Author: dyemanov

src/jrd/tra.cpp

@@ -2942,17 +2942,6 @@ static void transaction_options(thread_db* tdbb,
 					Arg::Str("isc_tpb_consistency") << Arg::Str("isc_tpb_read_consistency"));
 			}
 
-			if (rec_version.isAssigned())
-			{
-				const auto tpbStr = rec_version.asBool() ?
-					"isc_tpb_rec_version" : "isc_tpb_no_rec_version";
-
-				ERR_post(Arg::Gds(isc_bad_tpb_content) <<
-					// 'Option @1 is not valid if @2 was used previously in TPB'
-					Arg::Gds(isc_tpb_conflicting_options) <<
-					Arg::Str("isc_tpb_consistency") << Arg::Str(tpbStr) );
-			}
-
 			if (shared_snapshot)
 			{
 				ERR_post(
@@ -2981,17 +2970,6 @@ static void transaction_options(thread_db* tdbb,
 					Arg::Str("isc_tpb_concurrency") << Arg::Str("isc_tpb_read_consistency"));
 			}
 
-			if (rec_version.isAssigned())
-			{
-				const auto tpbStr = rec_version.asBool() ?
-					"isc_tpb_rec_version" : "isc_tpb_no_rec_version";
-
-				ERR_post(Arg::Gds(isc_bad_tpb_content) <<
-					// 'Option @1 is not valid if @2 was used previously in TPB'
-					Arg::Gds(isc_tpb_conflicting_options) <<
-					Arg::Str("isc_tpb_concurrency") << Arg::Str(tpbStr) );
-			}
-
 			transaction->tra_flags &= ~TRA_degree3;
 			transaction->tra_flags &= ~(TRA_read_committed | TRA_read_consistency | TRA_rec_version);
 			break;
@@ -3527,6 +3505,15 @@ static void transaction_options(thread_db* tdbb,
 		}
 	}
 
+	if (rec_version.isAssigned() && !(transaction->tra_flags & TRA_read_committed))
+	{
+		const auto tpbStr = rec_version.asBool() ?
+			"isc_tpb_rec_version" : "isc_tpb_no_rec_version";
+
+		ERR_post(Arg::Gds(isc_bad_tpb_content) <<
+				 Arg::Gds(isc_tpb_option_without_rc) << Arg::Str(tpbStr));
+	}
+
 	if ((transaction->tra_flags & TRA_read_committed) &&
 		!(transaction->tra_flags & TRA_read_consistency) &&
 		!(tdbb->tdbb_flags & TDBB_sweeper) &&