Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mariadb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
335ec7a3
Commit
335ec7a3
authored
Aug 11, 2015
by
Olivier Bertrand
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Prevent wrong update of expanded columns when pretty is not 2.
modified: storage/connect/tabjson.cpp
parent
5f533035
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
3 deletions
+9
-3
storage/connect/tabjson.cpp
storage/connect/tabjson.cpp
+9
-3
No files found.
storage/connect/tabjson.cpp
View file @
335ec7a3
...
...
@@ -755,7 +755,7 @@ int TDBJSN::MakeTopTree(PGLOBAL g, PJSON jsp)
}
else
strcpy
(
To_Line
,
s
);
Row
->
Clear
();
//
Row->Clear();
return
false
;
}
else
return
true
;
...
...
@@ -979,7 +979,8 @@ bool JSONCOL::ParseJpath(PGLOBAL g)
if
(
!
stricmp
(
Name
,
colp
->
GetName
()))
{
Nod
=
colp
->
Nod
;
Nodes
=
colp
->
Nodes
;
goto
fin
;
Xpd
=
colp
->
Xpd
;
goto
fin
;
}
// endif Name
sprintf
(
g
->
Message
,
"Cannot parse updated column %s"
,
Name
);
...
...
@@ -1347,7 +1348,12 @@ PJSON JSONCOL::GetRow(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. */
/*********************************************************************/
if
(
Value
!=
To_Val
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment