commit e9c4c3ae1562da6c957d1e958867b86082cac534
Author: Todd Rinaldo <toddr@cpanel.net>
Date:   Tue Feb 8 11:45:11 2011 -0600

    pointer_patch_5154.patch
    
    http://bugs.mysql.com/bug.php?id=58699

diff --git a/sql/sql_plugin.h b/sql/sql_plugin.h
index 7298486..90709f6 100644
--- a/sql/sql_plugin.h
+++ b/sql/sql_plugin.h
@@ -18,6 +18,8 @@
 
 class sys_var;
 
+#include "my_global.h"
+
 /*
   the following flags are valid for plugin_init()
 */
diff --git a/sql/sql_show.cc b/sql/sql_show.cc
index 1524a8f..0e260cc 100644
--- a/sql/sql_show.cc
+++ b/sql/sql_show.cc
@@ -2293,7 +2293,7 @@ static bool show_status_array(THD *thd, const char *wild,
           end= int10_to_str(*(long*) value, buff, 10);
           break;
         case SHOW_LONGLONG_STATUS:
-          value= ((char *) status_var + (ulonglong) value);
+          value= ((char *) status_var + (ulong) value);
           /* fall through */
         case SHOW_LONGLONG:
           end= longlong10_to_str(*(longlong*) value, buff, 10);