Merge branch 'mysql-8.0' into mysql-trunk

Change-Id: I3a455b9f9e4d3ce3a8799f55f7c67c924d619715

Author: ssorumgard

share/messages_to_error_log.txt

@@ -12285,6 +12285,9 @@ ER_IB_MSG_DDL_FAIL_NO_BUILDER
 ER_GRP_RPL_MEMBER_INFO_DOES_NOT_EXIST
   eng "Member identified %s: '%s' does not exist on Group Replication membership during %s."
 
+ER_USAGE_DEPRECATION_COUNTER
+  eng "Deprecated '%s' used %s times, last time used '%s'."
+
 #
 # End of 8.0 error messages intended to be written to the server error log.
 #

sql/mysqld.cc

@@ -11429,6 +11429,24 @@ static int show_telemetry_traces_support(THD * /*unused*/, SHOW_VAR *var,
   return 0;
 }
 
+static int show_deprecated_use_i_s_processlist_count(THD *, SHOW_VAR *var,
+                                                     char *buf) {
+  var->type = SHOW_LONG;
+  var->value = buf;
+  *((long *)buf) = (long)(deprecated_use_i_s_processlist_count.load());
+  return 0;
+}
+
+static int show_deprecated_use_i_s_processlist_last_timestamp(THD *,
+                                                              SHOW_VAR *var,
+                                                              char *buf) {
+  var->type = SHOW_LONGLONG;
+  var->value = buf;
+  *((long long *)buf) =
+      (long long)(deprecated_use_i_s_processlist_last_timestamp.load());
+  return 0;
+}
+
 SHOW_VAR status_vars[] = {
     {"Aborted_clients", (char *)&aborted_threads, SHOW_LONG, SHOW_SCOPE_GLOBAL},
     {"Aborted_connects", (char *)&show_aborted_connects, SHOW_FUNC,
@@ -11793,7 +11811,13 @@ SHOW_VAR status_vars[] = {
      SHOW_FUNC, SHOW_SCOPE_GLOBAL},
     {"Tls_sni_server_name", (char *)&show_ssl_get_tls_sni_servername, SHOW_FUNC,
      SHOW_SCOPE_SESSION},
-    {NullS, NullS, SHOW_LONG, SHOW_SCOPE_ALL}};
+    {"Deprecated_use_i_s_processlist_count",
+     (char *)&show_deprecated_use_i_s_processlist_count, SHOW_FUNC,
+     SHOW_SCOPE_GLOBAL},
+    {"Deprecated_use_i_s_processlist_last_timestamp",
+     (char *)&show_deprecated_use_i_s_processlist_last_timestamp, SHOW_FUNC,
+     SHOW_SCOPE_GLOBAL},
+    {NullS, NullS, SHOW_FUNC, SHOW_SCOPE_ALL}};
 
 void add_terminator(vector<my_option> *options) {
   my_option empty_element = {nullptr, 0,          nullptr, nullptr, nullptr,

sql/server_component/mysql_status_variable_reader_imp.cc

@@ -22,6 +22,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
 
 #include "mysql_status_variable_reader_imp.h"
 #include <mysql/components/minimal_chassis.h>  // mysql_components_handle_std_exception
+#include <sql/mysqld.h>                        // server_shutting_down
 #include <sql/sql_show.h>
 #include "mysql/components/services/log_builtins.h"  // LogErr
 #include "storing_auto_thd.h"
@@ -35,6 +36,12 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
 DEFINE_BOOL_METHOD(mysql_status_variable_reader_imp::get,
                    (MYSQL_THD hthd, const char *name, bool get_global,
                     my_h_string *out_string)) {
+  /* Cannot get status variable when server is shutting down. */
+  rwlock_scoped_lock rdlock(&LOCK_server_shutting_down, false, __FILE__,
+                            __LINE__);
+
+  if (server_shutting_down) return true;
+
   try {
     char buf[SHOW_VAR_FUNC_BUFF_SIZE + 1];
     size_t length = sizeof(buf);

sql/sql_show.cc

@@ -152,6 +152,12 @@ bool iterate_all_dynamic_privileges(THD *thd,
 using std::max;
 using std::min;
 
+/** Count number of times information_schema.processlist has been used. */
+std::atomic_ulong deprecated_use_i_s_processlist_count = 0;
+
+/** Last time information_schema.processlist was used, as usec since epoch. */
+std::atomic_ullong deprecated_use_i_s_processlist_last_timestamp = 0;
+
 /**
   @class CSET_STRING
   @brief Character set armed LEX_CSTRING
@@ -2767,6 +2773,9 @@ class List_process_list : public Do_THD_Impl {
         m_max_query_length(max_query_length) {
     push_deprecated_warn(m_client_thd, "INFORMATION_SCHEMA.PROCESSLIST",
                          "performance_schema.processlist");
+
+    deprecated_use_i_s_processlist_last_timestamp = my_micro_time();
+    deprecated_use_i_s_processlist_count++;
   }
 
   void operator()(THD *inspect_thd) override {
@@ -2999,6 +3008,9 @@ class Fill_process_list : public Do_THD_Impl {
       : m_client_thd(thd_value), m_tables(tables_value) {
     push_deprecated_warn(m_client_thd, "INFORMATION_SCHEMA.PROCESSLIST",
                          "performance_schema.processlist");
+
+    deprecated_use_i_s_processlist_last_timestamp = my_micro_time();
+    deprecated_use_i_s_processlist_count++;
   }
 
   ~Fill_process_list() override {

sql/sql_show.h

@@ -148,6 +148,8 @@ void show_sql_type(enum_field_types type, bool is_array, uint metadata,
 bool do_fill_information_schema_table(THD *thd, Table_ref *table_list,
                                       Item *condition);
 
+extern std::atomic_ulong deprecated_use_i_s_processlist_count;
+extern std::atomic_ullong deprecated_use_i_s_processlist_last_timestamp;
 extern TYPELIB grant_types;
 
 /**