From 8542743833c1f2d42faf95307752f968df97ffd0 Mon Sep 17 00:00:00 2001
From: "serg@serg.mylan" <>
Date: Tue, 13 Jul 2004 08:57:55 +0200
Subject: [PATCH 1/2] s/help all/help contents/ bug#4527

---
 client/mysql.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/mysql.cc b/client/mysql.cc
index 98bc7e750e1..c9ee6819a13 100644
--- a/client/mysql.cc
+++ b/client/mysql.cc
@@ -1727,7 +1727,7 @@ com_help(String *buffer __attribute__((unused)),
 		  commands[i].cmd_char, commands[i].doc);
   }
   if (connected && mysql_get_server_version(&mysql) >= 40100)
-    put_info("\nFor server side help, type 'help all'\n", INFO_INFO);
+    put_info("\nFor server side help, type 'help contents'\n", INFO_INFO);
   return 0;
 }
 

From 141d43ef95ba8c6e1113cdaf5145b31786d7457d Mon Sep 17 00:00:00 2001
From: "serg@serg.mylan" <>
Date: Tue, 13 Jul 2004 09:37:16 +0200
Subject: [PATCH 2/2] forced X/Open mode on HPUX removed. The correct way (that
 affects not only C but also C++ and linking) would be

CFLAGS="-D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED -D_HPUX_SOURCE"
CXXFLAGS="-D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED -D_HPUX_SOURCE"
LDFLAGS="-lxnet"

but apparently MySQL works without too.
---
 include/my_global.h | 20 --------------------
 1 file changed, 20 deletions(-)

diff --git a/include/my_global.h b/include/my_global.h
index 3c35ade8383..f7e77abfd26 100644
--- a/include/my_global.h
+++ b/include/my_global.h
@@ -120,26 +120,6 @@
 #define __STDC_EXT__ 1          /* To get large file support on hpux */
 #endif
 
-#ifdef HPUX11
-/*
-  Fix warnings on HPUX11
-  There is something really strange with HPUX11 include files as you get
-  error about wrongly declared symbols or missing defines if you don't
-  do the following:
- */
-#if !defined(_XOPEN_SOURCE_EXTENDED) && ! defined(__cplusplus)
-#define _XOPEN_SOURCE_EXTENDED 1
-#endif
-
-/* Fix type of socklen as this is depending on the above define */
-#undef SOCKET_SIZE_TYPE
-#ifdef _XOPEN_SOURCE_EXTENDED
-#define SOCKET_SIZE_TYPE socklen_t
-#else
-#define SOCKET_SIZE_TYPE int
-#endif /* _XOPEN_SOURCE_EXTENDED */
-#endif /* HPUX11 */
-
 #if defined(THREAD) && !defined(__WIN__) && !defined(OS2)
 #ifndef _POSIX_PTHREAD_SEMANTICS
 #define _POSIX_PTHREAD_SEMANTICS /* We want posix threads */