Changeset View
Changeset View
Standalone View
Standalone View
databases/mariadb101-server/files/patch-storage_connect_json.cpp
# Add patch for https://mariadb.atlassian.net/browse/MDEV-9322 | # Add patch for https://mariadb.atlassian.net/browse/MDEV-9322 | ||||
--- storage/connect/json.cpp.orig 2015-12-16 16:05:45 UTC | --- storage/connect/json.cpp.orig 2015-12-23 15:33:31 UTC | ||||
+++ storage/connect/json.cpp | +++ storage/connect/json.cpp | ||||
@@ -594,7 +594,7 @@ PSZ Serialize(PGLOBAL g, PJSON jsp, char | @@ -594,7 +594,7 @@ PSZ Serialize(PGLOBAL g, PJSON jsp, char | ||||
if (fs) { | if (fs) { | ||||
fputs(EL, fs); | fputs(EL, fs); | ||||
fclose(fs); | fclose(fs); | ||||
- str = (err) ? NULL : "Ok"; | - str = (err) ? NULL : "Ok"; | ||||
+ str = (err) ? NULL : (char*)"Ok"; | + str = (err) ? NULL : (char*)"Ok"; | ||||
} else if (!err) { | } else if (!err) { | ||||
str = ((JOUTSTR*)jp)->Strp; | str = ((JOUTSTR*)jp)->Strp; | ||||
jp->WriteChr('\0'); | jp->WriteChr('\0'); |