database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Try to fix failing tests

Browse Source
This commit is contained in:
Olivier Bertrand
2020-11-05 22:14:01 +01:00
parent ecb00f3cd8
commit addb28f62d
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
storage/connect/json.cpp
View File

@@ -1053,7 +1053,7 @@ PSZ JOBJECT::GetText(PGLOBAL g, PSZ text)
return text;
if (!text) {
text = (char*)PlugSubAlloc(g, NULL, 0);
text = (char*)PlugSubAlloc(g, NULL, 512); // TODO: get size
text[0] = 0;
n = 1;
} else
@@ -1079,8 +1079,8 @@ PSZ JOBJECT::GetText(PGLOBAL g, PSZ text)
} else for (PJPR jp = First; jp; jp = jp->Next)
jp->Val->GetText(g, text);
if (n)
PlugSubAlloc(g, NULL, strlen(text) + 1);
//if (n)
// PlugSubAlloc(g, NULL, strlen(text) + 1);
return text + n;
} // end of GetText;
@@ -1290,7 +1290,7 @@ PSZ JARRAY::GetText(PGLOBAL g, PSZ text)
PJVAL jp;
if (!text) {
text = (char*)PlugSubAlloc(g, NULL, 0);
text = (char*)PlugSubAlloc(g, NULL, 512);
text[0] = 0;
n = 1;
} else
@@ -1299,8 +1299,8 @@ PSZ JARRAY::GetText(PGLOBAL g, PSZ text)
for (jp = First; jp; jp = jp->Next)
jp->GetText(g, text);
if (n)
PlugSubAlloc(g, NULL, strlen(text) + 1);
//if (n)
// PlugSubAlloc(g, NULL, strlen(text) + 1);
return text + n;
} // end of GetText;
@@ -1536,8 +1536,7 @@ PSZ JVALUE::GetString(PGLOBAL g)
p = (char*)PlugDup(g, (Val->B) ? "true" : "false");
break;
case TYPE_NULL:
p = (char*)PlugDup(g, "null")
;
p = (char*)PlugDup(g, "null");
break;
default:
p = NULL;
@@ -1546,7 +1545,7 @@ PSZ JVALUE::GetString(PGLOBAL g)
} else
p = NULL;
return (p == buf)? (char*)PlugDup(g, buf) : p;
return (p == buf) ? (char*)PlugDup(g, buf) : p;
} // end of GetString
/***********************************************************************/