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
8286b680
Commit
8286b680
authored
Dec 13, 2015
by
Olivier Bertrand
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
- Copy error message from G to g when using temporary storage for parsing.
modified: storage/connect/tabjson.cpp
parent
541d36f7
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
1 deletion
+9
-1
storage/connect/tabjson.cpp
storage/connect/tabjson.cpp
+9
-1
No files found.
storage/connect/tabjson.cpp
View file @
8286b680
...
@@ -688,8 +688,13 @@ int TDBJSN::ReadDB(PGLOBAL g)
...
@@ -688,8 +688,13 @@ int TDBJSN::ReadDB(PGLOBAL g)
Fpos
++
;
Fpos
++
;
M
=
1
;
M
=
1
;
rc
=
RC_OK
;
rc
=
RC_OK
;
}
else
if
(
Pretty
!=
1
||
strcmp
(
To_Line
,
"]"
))
{
#if USE_G
strcpy
(
g
->
Message
,
G
->
Message
);
#endif
rc
=
RC_FX
;
}
else
}
else
rc
=
(
Pretty
==
1
&&
!
strcmp
(
To_Line
,
"]"
))
?
RC_EF
:
RC_FX
;
rc
=
RC_EF
;
}
// endif ReadDB
}
// endif ReadDB
...
@@ -793,6 +798,9 @@ int TDBJSN::MakeTopTree(PGLOBAL g, PJSON jsp)
...
@@ -793,6 +798,9 @@ int TDBJSN::MakeTopTree(PGLOBAL g, PJSON jsp)
int
rc
=
TDBDOS
::
WriteDB
(
g
);
int
rc
=
TDBDOS
::
WriteDB
(
g
);
#if USE_G
#if USE_G
if
(
rc
==
RC_FX
)
strcpy
(
g
->
Message
,
G
->
Message
);
PlugSubSet
(
G
,
G
->
Sarea
,
G
->
Sarea_Size
);
PlugSubSet
(
G
,
G
->
Sarea
,
G
->
Sarea_Size
);
#endif
#endif
Row
->
Clear
();
Row
->
Clear
();
...
...
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