summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlivier Bertrand <bertrandop@gmail.com>2015-12-27 19:45:51 +0100
committerOlivier Bertrand <bertrandop@gmail.com>2015-12-27 19:45:51 +0100
commit6883e5c4c40d1411dcc7c43bbb7cbb3f2d0ab251 (patch)
tree69a0e8dee1e36d40926e275ef772cfa17eddcf17
parent11c339f4327c9ff88bfb62e342f45550d3c6140c (diff)
downloadmariadb-git-6883e5c4c40d1411dcc7c43bbb7cbb3f2d0ab251.tar.gz
- Fix MDEV-9322.
modified: storage/connect/json.cpp
-rw-r--r--storage/connect/json.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/connect/json.cpp b/storage/connect/json.cpp
index fc7edb84c0f..75bf277b25b 100644
--- a/storage/connect/json.cpp
+++ b/storage/connect/json.cpp
@@ -594,8 +594,8 @@ PSZ Serialize(PGLOBAL g, PJSON jsp, char *fn, int pretty)
if (fs) {
fputs(EL, fs);
fclose(fs);
- str = (err) ? NULL : "Ok";
- } else if (!err) {
+ str = (err) ? NULL : strcpy(g->Message, "Ok");
+ } else if (!err) {
str = ((JOUTSTR*)jp)->Strp;
jp->WriteChr('\0');
PlugSubAlloc(g, NULL, ((JOUTSTR*)jp)->N);