Fix compile warning as error

MariaDB · May 2, 2021 · 2294f9d · 2294f9d
1 parent ef0829e
commit 2294f9d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/storage/connect/cmgoconn.cpp b/storage/connect/cmgoconn.cpp
@@ -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) {

diff --git a/storage/connect/ha_connect.cc b/storage/connect/ha_connect.cc
@@ -170,9 +170,9 @@
 #define JSONMAX      10             // JSON Default max grp size
 
 extern "C" {
-       char version[]= "Version 1.07.0002 March 22, 2021";
+       char version[]= "Version 1.07.0003 March 22, 2021";
 #if defined(__WIN__)
-       char compver[]= "Version 1.07.0002 " __DATE__ " "  __TIME__;
+       char compver[]= "Version 1.07.0003 " __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.0002",                                  /* string version */
+  "1.07.0003",                                  /* string version */
 	MariaDB_PLUGIN_MATURITY_STABLE                /* maturity */
 }
 maria_declare_plugin_end;
diff --git a/storage/connect/json.h b/storage/connect/json.h
@@ -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.   */