Fixed wrong protocol version usage, as noted by Mark

hvlad · hvlad · commit ebb64f938fd2 · 2025-04-17T11:16:22.000+03:00
diff --git a/src/isql/isql.epp b/src/isql/isql.epp
@@ -124,7 +124,7 @@ enum literal_string_type
 #include "../isql/PtrSentry.h"
 #include "../common/classes/UserBlob.h"
 #include "../common/classes/MsgPrint.h"
-#include "../common/classes/array.h"
+#include "../remote/protocol.h"
 
 using namespace Firebird;
 using MsgFormat::SafeArg;
@@ -4008,8 +4008,8 @@ static void check_autoterm()
 		}
 	}
 
-	if (!(protocolVersion == 0 || protocolVersion >= 19) &&	// PROTOCOL_VERSION19
-		  isqlGlob.major_ods >= ODS_VERSION14)
+	if (!(protocolVersion == 0 || protocolVersion >= PROTOCOL_PREPARE_FLAG) &&
+		isqlGlob.major_ods >= ODS_VERSION14)
 	{
 		setValues.AutoTerm = false;
 

Original file line number	Diff line number	Diff line change
`@@ -124,7 +124,7 @@ enum literal_string_type`
`124`	`124`	`#include "../isql/PtrSentry.h"`
`125`	`125`	`#include "../common/classes/UserBlob.h"`
`126`	`126`	`#include "../common/classes/MsgPrint.h"`
`127`		`-#include "../common/classes/array.h"`
	`127`	`+#include "../remote/protocol.h"`
`128`	`128`
`129`	`129`	`using namespace Firebird;`
`130`	`130`	`using MsgFormat::SafeArg;`
`@@ -4008,8 +4008,8 @@ static void check_autoterm()`
`4008`	`4008`	`}`
`4009`	`4009`	`}`
`4010`	`4010`
`4011`		`- if (!(protocolVersion == 0 \|\| protocolVersion >= 19) && // PROTOCOL_VERSION19`
`4012`		`- isqlGlob.major_ods >= ODS_VERSION14)`
	`4011`	`+ if (!(protocolVersion == 0 \|\| protocolVersion >= PROTOCOL_PREPARE_FLAG) &&`
	`4012`	`+ isqlGlob.major_ods >= ODS_VERSION14)`
`4013`	`4013`	`{`
`4014`	`4014`	`setValues.AutoTerm = false;`
`4015`	`4015`