gistfile1.txt

***************
*** 1235,1240 ****
--- 1236,1246 ----
  */

  class Security_context {
+ private:
+
+ String host;
+ String ip;
+ String external_user;
  public:
    Security_context() {}                       /* Remove gcc warning */
    /*
***************
*** 1244,1256 ****
      priv_user - The user privilege we are using. May be "" for anonymous user.
      ip - client IP
    */
!   char   *host, *user, *ip;
    char   priv_user[USERNAME_LENGTH];
    char   proxy_user[USERNAME_LENGTH + MAX_HOSTNAME + 5];
    /* The host privilege we are using */
    char   priv_host[MAX_HOSTNAME];
-   /* The external user (if available) */
-   char   *external_user;
    /* points to host if host is available, otherwise points to ip */
    const char *host_or_ip;
    ulong master_access;                 /* Global privileges from mysql.user */