Merge pull request #7014 from red-soft-ru/5_0_fix_5082

Fix #5082: Exception "too few key columns found for index" raises when attempt to create table with PK and immediatelly drop this PK within the same transaction

src/jrd/dfw.epp

@@ -3495,18 +3495,18 @@ static bool create_index(thread_db* tdbb, SSHORT phase, DeferredWork* work, jrd_
 		}
 		END_FOR
 
-		if (key_count != idx.idx_count)
+		if (!relation)
 		{
-			ERR_post(Arg::Gds(isc_no_meta_update) <<
-					 Arg::Gds(isc_key_field_err) << Arg::Str(work->dfw_name));
-			// Msg352: too few key columns found for index %s (incorrect column name?)
+			// The record was not found in RDB$INDICES.
+			// Apparently the index was dropped in the same transaction.
+			return false;
 		}
 
-		if (!relation)
+		if (key_count != idx.idx_count)
 		{
 			ERR_post(Arg::Gds(isc_no_meta_update) <<
-					 Arg::Gds(isc_idx_create_err) << Arg::Str(work->dfw_name));
-			// Msg308: can't create index %s
+					 Arg::Gds(isc_key_field_err) << Arg::Str(work->dfw_name));
+			// Msg352: too few key columns found for index %s (incorrect column name?)
 		}
 
 		// Make sure the relation info is all current