diff options
| author | Olivier Bertrand <bertrandop@gmail.com> | 2015-03-01 19:20:40 +0100 |
|---|---|---|
| committer | Olivier Bertrand <bertrandop@gmail.com> | 2015-03-01 19:20:40 +0100 |
| commit | 5c8862ee19eed2b6ddb9116c40c9ebbd67ee71ea (patch) | |
| tree | 30e3c00a3d52d6bf590e04f8ee423bc10704c33a /storage/connect/json.cpp | |
| parent | d862d7c049f95575242164341605b7e69d71e427 (diff) | |
| download | mariadb-git-5c8862ee19eed2b6ddb9116c40c9ebbd67ee71ea.tar.gz | |
- Fix crash when Json_Value was called without arguments.
Correct memory calculation in Serialize.
Correct some UDF's messages.
Add and modify the json tests
removed:
storage/connect/mysql-test/connect/std_data/biblio.jsn
storage/connect/mysql-test/connect/std_data/expense.jsn
storage/connect/mysql-test/connect/std_data/mulexp3.jsn
storage/connect/mysql-test/connect/std_data/mulexp4.jsn
storage/connect/mysql-test/connect/std_data/mulexp5.jsn
added:
storage/connect/mysql-test/connect/r/json_udf.result
storage/connect/mysql-test/connect/std_data/biblio.json
storage/connect/mysql-test/connect/std_data/expense.json
storage/connect/mysql-test/connect/std_data/mulexp3.json
storage/connect/mysql-test/connect/std_data/mulexp4.json
storage/connect/mysql-test/connect/std_data/mulexp5.json
storage/connect/mysql-test/connect/t/json_udf.test
modified:
storage/connect/json.cpp
storage/connect/jsonudf.cpp
storage/connect/mysql-test/connect/r/json.result
storage/connect/mysql-test/connect/t/json.test
Diffstat (limited to 'storage/connect/json.cpp')
| -rw-r--r-- | storage/connect/json.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/connect/json.cpp b/storage/connect/json.cpp index 7356a86d53c..6f4bd18457b 100644 --- a/storage/connect/json.cpp +++ b/storage/connect/json.cpp @@ -662,7 +662,7 @@ JOUTSTR::JOUTSTR(PGLOBAL g) : JOUT(g) N = 0; Max = pph->FreeBlk; - Max = (Max > 512) ? Max - 512 : Max; + Max = (Max > 32) ? Max - 32 : Max; Strp = (char*)PlugSubAlloc(g, NULL, 0); // Size not know yet } // end of JOUTSTR constructor |