Merge remote-tracking branch 'core/master' into 1.8.0_prep

Author: Michael Fero

cpp-driver/build.yaml

@@ -43,6 +43,9 @@ package:
   include: # list of files and glob paths to include in the artifact, relative to the current working directory
     - packaging/packages/*
 release:
+  matrix:
+    exclude:
+      - os: [ osx/high-sierra ]
   after:
     each:
       - script: |

cpp-driver/examples/udt/udt.c

@@ -248,8 +248,6 @@ int main(int argc, char* argv[]) {
     return -1;
   }
 
-  schema_meta = cass_session_get_schema_meta(session);
-
   execute_query(session,
                 "CREATE KEYSPACE examples WITH replication = { \
                            'class': 'SimpleStrategy', 'replication_factor': '3' }");
@@ -263,6 +261,8 @@ int main(int argc, char* argv[]) {
   execute_query(session,
                 "CREATE TABLE examples.udt (id timeuuid, address frozen<address>, PRIMARY KEY(id))");
 
+  schema_meta = cass_session_get_schema_meta(session);
+
   insert_into_udt(session);
   select_from_udt(session);
 

cpp-driver/src/control_connector.cpp

@@ -329,7 +329,7 @@ void ControlConnector::handle_query_schema(SchemaConnectorRequestCallback* callb
   schema_.views = callback->result("views");
   schema_.columns = callback->result("columns");
   schema_.indexes = callback->result("indexes");
-  schema_.user_types = callback->result("types");
+  schema_.user_types = callback->result("user_types");
   schema_.functions = callback->result("functions");
   schema_.aggregates = callback->result("aggregates");
   schema_.virtual_keyspaces = callback->result("virtual_keyspaces");