Commit 4ba691b0 authored by unknown's avatar unknown
Browse files

Fix for bug #22723: Host field blank when server started with skip-grant

We set 'host_or_ip' to "" in the Security_context::skip_grants().




sql/sql_show.cc:
  Fix for bug #22723: Host field blank when server started with skip-grant
    - as we set 'host_or_ip' to "" if skip-grant, use 'host' instead.
parent 04c8b8d1
Loading
Loading
Loading
Loading
+3 −1
Original line number Diff line number Diff line
@@ -1323,7 +1323,9 @@ void mysqld_list_processes(THD *thd,const char *user, bool verbose)
			"%s:%u", tmp_sctx->host_or_ip, tmp->peer_port);
	}
	else
	  thd_info->host= thd->strdup(tmp_sctx->host_or_ip);
	  thd_info->host= thd->strdup(tmp_sctx->host_or_ip[0] ? 
                                      tmp_sctx->host_or_ip : 
                                      tmp_sctx->host ? tmp_sctx->host : "");
        if ((thd_info->db=tmp->db))             // Safe test
          thd_info->db=thd->strdup(thd_info->db);
        thd_info->command=(int) tmp->command;