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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
2294f9de
Commit
2294f9de
authored
May 02, 2021
by
Olivier Bertrand
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix compile warning as error
parent
ef0829ef
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
8 deletions
+9
-8
storage/connect/cmgoconn.cpp
storage/connect/cmgoconn.cpp
+5
-5
storage/connect/ha_connect.cc
storage/connect/ha_connect.cc
+3
-3
storage/connect/json.h
storage/connect/json.h
+1
-0
No files found.
storage/connect/cmgoconn.cpp
View file @
2294f9de
...
...
@@ -250,16 +250,16 @@ int CMgoConn::CollSize(PGLOBAL g)
}
else
query
=
bson_new
();
#if defined(NDEBUG)
cnt
=
(
int
)
mongoc_collection_count
(
Collection
,
MONGOC_QUERY_NONE
,
query
,
0
,
0
,
NULL
,
&
Error
);
#else
#if defined(DEVELOPMENT)
if
(
jf
)
cnt
=
(
int
)
mongoc_collection_count_documents
(
Collection
,
query
,
NULL
,
NULL
,
NULL
,
&
Error
);
else
cnt
=
(
int
)
mongoc_collection_estimated_document_count
(
Collection
,
NULL
,
NULL
,
NULL
,
&
Error
);
Collection
,
NULL
,
NULL
,
NULL
,
&
Error
);
#else
cnt
=
(
int
)
mongoc_collection_count
(
Collection
,
MONGOC_QUERY_NONE
,
query
,
0
,
0
,
NULL
,
&
Error
);
#endif
if
(
cnt
<
0
)
{
...
...
storage/connect/ha_connect.cc
View file @
2294f9de
...
...
@@ -170,9 +170,9 @@
#define JSONMAX 10 // JSON Default max grp size
extern
"C"
{
char
version
[]
=
"Version 1.07.000
2
March 22, 2021"
;
char
version
[]
=
"Version 1.07.000
3
March 22, 2021"
;
#if defined(__WIN__)
char
compver
[]
=
"Version 1.07.000
2
"
__DATE__
" "
__TIME__
;
char
compver
[]
=
"Version 1.07.000
3
"
__DATE__
" "
__TIME__
;
char
slash
=
'\\'
;
#else // !__WIN__
char
slash
=
'/'
;
...
...
@@ -7511,7 +7511,7 @@ maria_declare_plugin(connect)
0x0107
,
/* version number (1.07) */
NULL
,
/* status variables */
connect_system_variables
,
/* system variables */
"1.07.000
2
"
,
/* string version */
"1.07.000
3
"
,
/* string version */
MariaDB_PLUGIN_MATURITY_STABLE
/* maturity */
}
maria_declare_plugin_end
;
storage/connect/json.h
View file @
2294f9de
...
...
@@ -66,6 +66,7 @@ const char* GetFmt(int type, bool un);
PJSON
ParseJson
(
PGLOBAL
g
,
char
*
s
,
size_t
n
,
int
*
prty
=
NULL
,
bool
*
b
=
NULL
);
PSZ
Serialize
(
PGLOBAL
g
,
PJSON
jsp
,
char
*
fn
,
int
pretty
);
DllExport
bool
IsNum
(
PSZ
s
);
bool
IsArray
(
PSZ
s
);
/***********************************************************************/
/* Class JDOC. The class for parsing and serializing json documents. */
...
...
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