database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Fix failed test bson and xml

Browse Source
This commit is contained in:
Olivier Bertrand
2021-01-30 12:07:37 +01:00
parent 7ab30f5d95
commit c2aecb0575
3 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
storage/connect/bson.cpp
View File

@@ -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;

3
storage/connect/bson.h
View File

@@ -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

2
storage/connect/mysql-test/connect/r/xml.result
View File

@@ -374,7 +374,7 @@ INSERT INTO t1 VALUES (_cp1251 0xC0C1C2C3);
Warnings:
Level Warning
Code 1105
Message Com error: Impossible d'enregistrer le caract<EFBFBD>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;