Merge remote-tracking branch 'origin/release/2.0.3' into release

Author: rsomla1

CMakeLists.txt

@@ -183,8 +183,12 @@ else()
   # Note: setting target property CXX_VISIBILITY did not work for
   # object libraries that we use to build the connector.
 
-  if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-    add_compile_options(-fvisibility=hidden)
+  if(CMAKE_COMPILER_IS_GNUCXX)
+    if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+      add_compile_options(-fvisibility-ms-compat)
+    elseif()
+      add_compile_options(-fvisibility=hidden)
+    endif()
   endif()
 
 endif()

cdk/mysqlx/tests/session_mysqlx-t.cc

@@ -55,7 +55,7 @@ class Session_mysqlx
     bytes data2((byte*)buffer, sz);
     codec.to_bytes(val, data2);
     int rc = memcmp(data.begin(), data2.begin(), sz);
-    delete buffer;
+    delete[] buffer;
     if (rc != 0)
     {
       throw "Diff data generated!";

cdk/parser/tokenizer.cc

@@ -324,12 +324,12 @@ bool Tokenizer::parse_hex(size_t& i)
 {
   std::string val;
   bool has_value = false;
-  int start = i;
+
   if((_input[i] == 'X' || _input[i] == 'x') && next_char_is(i, '\''))
   {
     i+=2;
 
-    start = i;
+    size_t start = i;
 
     for (; i < _input.size();++i)
     {
@@ -347,7 +347,7 @@ bool Tokenizer::parse_hex(size_t& i)
   {
     i+=2;
 
-    int start = i;
+    size_t start = i;
 
     for (; i < _input.size() && std::isalnum(_input[i]);++i)
     {}

cdk/protocol/mysqlx/tests/proto_mysqlx_crud-t.cc

@@ -377,7 +377,7 @@ class Expr_printer
     out_ind() << val <<endl;
   }
 
-  virtual void octets(bytes val)
+  virtual void octets(bytes val, Octets_content_type)
   {
     out_ind() <<"\"" <<std::string(val.begin(), val.end()) <<"\"" <<endl;
   }
@@ -787,7 +787,7 @@ TEST_F(Protocol_mysqlx_xplugin, crud_projections)
       prc.list_begin();
 
       Processor::Element_prc *ep;
-        
+
       ep = prc.list_el();
       if (ep)
       {

cdk/protocol/mysqlx/tests/proto_mysqlx_msg-t.cc

@@ -149,7 +149,7 @@ struct Scalar_checker
   // in documents obtained from parsing JSON strings, only scalar
   // values should be present, no expressions.
 
-  void octets(bytes) { FAIL(); }
+  void octets(bytes, Octets_content_type) { FAIL(); }
 };