diff options
| author | Olivier Bertrand <bertrandop@gmail.com> | 2020-12-15 12:28:03 +0100 |
|---|---|---|
| committer | Olivier Bertrand <bertrandop@gmail.com> | 2020-12-15 12:28:03 +0100 |
| commit | ceacffbb3b9504c88d0649d472396fa42397a62c (patch) | |
| tree | 958afa431d8c85373f24030bafee194b2af759a1 /storage/connect/tabbson.h | |
| parent | aa10789f472b975f3ffae2a5adc6514a879226ba (diff) | |
| download | mariadb-git-ceacffbb3b9504c88d0649d472396fa42397a62c.tar.gz | |
- Fix pretty=2 Tabjson bug on INSERT.
Occuring when inserting more than one line in one statement.
modified: storage/connect/json.cpp
- Fix a wrong if statement
modified: storage/connect/tabjson.cpp
- Continue BSON implementation
modified: storage/connect/bson.cpp
modified: storage/connect/bson.h
modified: storage/connect/filamtxt.cpp
modified: storage/connect/filamtxt.h
modified: storage/connect/tabbson.cpp
modified: storage/connect/tabbson.h
- No need anymore
deleted: storage/connect/mysql-test/connect/r/bson.result
deleted: storage/connect/mysql-test/connect/t/bson.test
Diffstat (limited to 'storage/connect/tabbson.h')
| -rw-r--r-- | storage/connect/tabbson.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/storage/connect/tabbson.h b/storage/connect/tabbson.h index 677bcbfd6e9..5b764b2eabd 100644 --- a/storage/connect/tabbson.h +++ b/storage/connect/tabbson.h @@ -111,7 +111,7 @@ public: // Utility functions PBVAL FindRow(PGLOBAL g); PBVAL ParseLine(PGLOBAL g, int *pretty, bool *comma); - PBVAL MakeTopTree(PGLOBAL g, PBVAL jsp); + PBVAL MakeTopTree(PGLOBAL g, int type); PSZ SerialVal(PGLOBAL g, PBVAL top, int pretty); protected: @@ -196,10 +196,9 @@ protected: //int MakeTopTree(PGLOBAL g, PBVAL jsp); // Members - PBTUT Bp; // The BSUTIL handling class + PBTUT Bp; // The BSUTIL handling class PBVAL Top; // The top JSON tree PBVAL Row; // The current row - PBVAL Val; // The value of the current row PBSCOL Colp; // The multiple column JMODE Jmode; // MODE_OBJECT by default PCSZ Objname; // The table object name |