Merge branch 'mysql-5.6' into mysql-5.7

Author: Anushree Prakash B

libbinlogevents/src/control_events.cpp

@@ -1,4 +1,4 @@
-/* Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -866,7 +866,8 @@ View_change_event::View_change_event(char* raw_view_id)
 : Binary_log_event(VIEW_CHANGE_EVENT),
   view_id(), seq_number(0), certification_info()
 {
-  memcpy(view_id, raw_view_id, strlen(raw_view_id));
+  strncpy(view_id, raw_view_id, sizeof(view_id)-1);
+  view_id[sizeof(view_id)-1]= 0;
 }
 
 View_change_event::

libmysql/authentication_win/common.cc

@@ -1,4 +1,4 @@
-/* Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -504,7 +504,7 @@ const char* get_last_error_message(Error_message_buf buf)
   buf[0]= '\0';
   FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM,
 		NULL, error, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
-		(LPTSTR)buf, sizeof(buf), NULL );
+		(LPTSTR)buf, sizeof(Error_message_buf), NULL);
 
   return buf;
 }

rapid/plugin/x/mysqlxtest_src/mysqlxtest.cc

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -505,7 +505,7 @@ class Connection_manager
   mysqlx::XProtocol* active()
   {
     if (!active_connection)
-      std::runtime_error("no active session");
+      throw std::runtime_error("no active session");
     return active_connection.get();
   }