From c2aecb05751ee7319722cbe4c65b974e1f10fbbb Mon Sep 17 00:00:00 2001
From: Olivier Bertrand <bertrandop@gmail.com>
Date: Sat, 30 Jan 2021 12:07:37 +0100
Subject: [PATCH] Fix failed test bson and xml

---
 storage/connect/bson.cpp                        | 1 -
 storage/connect/bson.h                          | 3 +--
 storage/connect/mysql-test/connect/r/xml.result | 2 +-
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/storage/connect/bson.cpp b/storage/connect/bson.cpp
index 6c979498286..a494cf3166b 100644
--- a/storage/connect/bson.cpp
+++ b/storage/connect/bson.cpp
@@ -886,7 +886,6 @@ PBPR BJSON::NewPair(OFFSET key, int type)
   PBPR bpp = (PBPR)BsonSubAlloc(sizeof(BPAIR));
 
   bpp->Key = key;
-  bpp->Vlp.Ktp = TYPE_STRG;
   bpp->Vlp.Type = type;
   bpp->Vlp.To_Val = 0;
   bpp->Vlp.Nd = 0;
diff --git a/storage/connect/bson.h b/storage/connect/bson.h
index 32a9c49b00a..4da86aeac67 100644
--- a/storage/connect/bson.h
+++ b/storage/connect/bson.h
@@ -37,8 +37,7 @@ typedef struct _jvalue {
 		bool   B;				  // A boolean value True or false (0)
 	};
 	short    Nd;				// Number of decimals
-	char     Type;      // The value type
-	char     Ktp;       // The key type
+	short    Type;      // The value type
 	OFFSET   Next;      // Offset to the next value in array
 } BVAL, *PBVAL;  // end of struct BVALUE
 
diff --git a/storage/connect/mysql-test/connect/r/xml.result b/storage/connect/mysql-test/connect/r/xml.result
index 599c35cb1ed..6a0c9db27b3 100644
--- a/storage/connect/mysql-test/connect/r/xml.result
+++ b/storage/connect/mysql-test/connect/r/xml.result
@@ -374,7 +374,7 @@ INSERT INTO t1 VALUES (_cp1251 0xC0C1C2C3);
 Warnings:
 Level	Warning
 Code	1105
-Message	Com error: Impossible d'enregistrer le caractère dans le codage iso-8859-1.
+Message	Com error: Unable to save character to 'iso-8859-1' encoding.
 
 INSERT INTO t1 VALUES ('&<>"\'');
 SELECT node, hex(node) FROM t1;