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

Prevent wrong update of expanded columns when pretty is not 2.

Browse Source 
modified:   storage/connect/tabjson.cpp
This commit is contained in:
Olivier Bertrand
2015-08-11 21:15:33 +02:00
parent 5f533035d3
commit 335ec7a363
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
storage/connect/tabjson.cpp
View File

@@ -755,7 +755,7 @@ int TDBJSN::MakeTopTree(PGLOBAL g, PJSON jsp)
} else } else
strcpy(To_Line, s); strcpy(To_Line, s);
Row->Clear(); // Row->Clear();
return false; return false;
} else } else
return true; return true;
@@ -979,7 +979,8 @@ bool JSONCOL::ParseJpath(PGLOBAL g)
if (!stricmp(Name, colp->GetName())) { if (!stricmp(Name, colp->GetName())) {
Nod = colp->Nod; Nod = colp->Nod;
Nodes = colp->Nodes; Nodes = colp->Nodes;
goto fin; Xpd = colp->Xpd;
goto fin;
} // endif Name } // endif Name
sprintf(g->Message, "Cannot parse updated column %s", Name); sprintf(g->Message, "Cannot parse updated column %s", Name);
@@ -1347,7 +1348,12 @@ PJSON JSONCOL::GetRow(PGLOBAL g)
/***********************************************************************/ /***********************************************************************/
void JSONCOL::WriteColumn(PGLOBAL g) void JSONCOL::WriteColumn(PGLOBAL g)
{ {
/*********************************************************************/ if (Xpd && Tjp->Pretty < 2) {
strcpy(g->Message, "Cannot write expanded column when Pretty is not 2");
longjmp(g->jumper[g->jump_level], 666);
} // endif Xpd
/*********************************************************************/
/* Check whether this node must be written. */ /* Check whether this node must be written. */
/*********************************************************************/ /*********************************************************************/
if (Value != To_Val) if (Value != To_Val)