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/json.cpp | |
| 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/json.cpp')
| -rw-r--r-- | storage/connect/json.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/connect/json.cpp b/storage/connect/json.cpp index bf7ff7170ff..7c1748e0fde 100644 --- a/storage/connect/json.cpp +++ b/storage/connect/json.cpp @@ -1665,7 +1665,7 @@ void JVALUE::SetValue(PGLOBAL g, PVAL valp) } else switch (valp->GetType()) { case TYPE_DATE: if (((DTVAL*)valp)->IsFormatted()) - Strp = valp->GetCharValue(); + Strp = PlugDup(g, valp->GetCharValue()); else { char buf[32]; @@ -1675,7 +1675,7 @@ void JVALUE::SetValue(PGLOBAL g, PVAL valp) DataType = TYPE_DTM; break; case TYPE_STRING: - Strp = valp->GetCharValue(); + Strp = PlugDup(g, valp->GetCharValue()); DataType = TYPE_STRG; break; case TYPE_DOUBLE: |