Skip to content

Commit 2294f9d

Browse files
committed
Fix compile warning as error
1 parent ef0829e commit 2294f9d

File tree

3 files changed

+9
-8
lines changed

3 files changed

+9
-8
lines changed

storage/connect/cmgoconn.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -250,16 +250,16 @@ int CMgoConn::CollSize(PGLOBAL g)
250250
} else
251251
query = bson_new();
252252

253-
#if defined(NDEBUG)
254-
cnt = (int)mongoc_collection_count(Collection,
255-
MONGOC_QUERY_NONE, query, 0, 0, NULL, &Error);
256-
#else
253+
#if defined(DEVELOPMENT)
257254
if (jf)
258255
cnt = (int)mongoc_collection_count_documents(Collection,
259256
query, NULL, NULL, NULL, &Error);
260257
else
261258
cnt = (int)mongoc_collection_estimated_document_count(
262-
Collection, NULL, NULL, NULL, &Error);
259+
Collection, NULL, NULL, NULL, &Error);
260+
#else
261+
cnt = (int)mongoc_collection_count(Collection,
262+
MONGOC_QUERY_NONE, query, 0, 0, NULL, &Error);
263263
#endif
264264

265265
if (cnt < 0) {

storage/connect/ha_connect.cc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -170,9 +170,9 @@
170170
#define JSONMAX 10 // JSON Default max grp size
171171

172172
extern "C" {
173-
char version[]= "Version 1.07.0002 March 22, 2021";
173+
char version[]= "Version 1.07.0003 March 22, 2021";
174174
#if defined(__WIN__)
175-
char compver[]= "Version 1.07.0002 " __DATE__ " " __TIME__;
175+
char compver[]= "Version 1.07.0003 " __DATE__ " " __TIME__;
176176
char slash= '\\';
177177
#else // !__WIN__
178178
char slash= '/';
@@ -7511,7 +7511,7 @@ maria_declare_plugin(connect)
75117511
0x0107, /* version number (1.07) */
75127512
NULL, /* status variables */
75137513
connect_system_variables, /* system variables */
7514-
"1.07.0002", /* string version */
7514+
"1.07.0003", /* string version */
75157515
MariaDB_PLUGIN_MATURITY_STABLE /* maturity */
75167516
}
75177517
maria_declare_plugin_end;

storage/connect/json.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ const char* GetFmt(int type, bool un);
6666
PJSON ParseJson(PGLOBAL g, char* s, size_t n, int* prty = NULL, bool* b = NULL);
6767
PSZ Serialize(PGLOBAL g, PJSON jsp, char *fn, int pretty);
6868
DllExport bool IsNum(PSZ s);
69+
bool IsArray(PSZ s);
6970

7071
/***********************************************************************/
7172
/* Class JDOC. The class for parsing and serializing json documents. */

0 commit comments

Comments
 (0)