From a7c17eee46b6568507b3e6ba6038ae5368eb3f44 Mon Sep 17 00:00:00 2001
From: "monty@mysql.com" <>
Date: Fri, 28 May 2004 00:32:55 +0300
Subject: [PATCH 1/3] Portability fix for 32 bit file systems

---
 mysql-test/r/variables.result | 2 +-
 mysql-test/t/variables.test   | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/mysql-test/r/variables.result b/mysql-test/r/variables.result
index f84364089bc..e36f4165f46 100644
--- a/mysql-test/r/variables.result
+++ b/mysql-test/r/variables.result
@@ -380,4 +380,4 @@ Variable 'key_buffer_size' is a GLOBAL variable
 set global myisam_max_sort_file_size=4294967296;
 show global variables like 'myisam_max_sort_file_size';
 Variable_name	Value
-myisam_max_sort_file_size	4294967296
+myisam_max_sort_file_size	MAX_FILE_SIZE
diff --git a/mysql-test/t/variables.test b/mysql-test/t/variables.test
index e59667d6af4..b9aa52ec627 100644
--- a/mysql-test/t/variables.test
+++ b/mysql-test/t/variables.test
@@ -274,4 +274,5 @@ select @@session.key_buffer_size;
 # expected: check that there is no overflow when 64-bit unsigned
 # variables are set
 set global myisam_max_sort_file_size=4294967296;
+--replace_result 4294967296 MAX_FILE_SIZE 2146435072 MAX_FILE_SIZE
 show global variables like 'myisam_max_sort_file_size';

From 47cc3af0e9b10ef3d6006bf02b403e0229ab7ddb Mon Sep 17 00:00:00 2001
From: "monty@mysql.com" <>
Date: Fri, 28 May 2004 01:02:20 +0300
Subject: [PATCH 2/3] Always enable HAVE_COMPRESS on netware

---
 include/config-netware.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/include/config-netware.h b/include/config-netware.h
index c4e63056353..3e145f566a1 100644
--- a/include/config-netware.h
+++ b/include/config-netware.h
@@ -57,6 +57,10 @@ extern "C" {
   #undef HAVE_CRYPT
 #endif /* HAVE_OPENSSL */
 
+/* Configure can't detect this because it uses AC_TRY_RUN */
+#undef HAVE_COMPRESS
+#define HAVE_COMPRESS
+
 /* include the old function apis */
 #define USE_OLD_FUNCTIONS 1
 

From 33dcccb5bfa027440f9e8ed06cc342bced9041e0 Mon Sep 17 00:00:00 2001
From: "monty@mysql.com" <>
Date: Fri, 28 May 2004 02:00:34 +0300
Subject: [PATCH 3/3] Portability fix for HPUX

---
 configure.in          | 3 +++
 innobase/os/os0file.c | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/configure.in b/configure.in
index 29a887076ac..f2b66d1e09d 100644
--- a/configure.in
+++ b/configure.in
@@ -2484,6 +2484,9 @@ AC_SUBST(netware_dir)
 AC_SUBST(linked_netware_sources)
 AM_CONDITIONAL(HAVE_NETWARE, test "$netware_dir" = "netware")
 
+# Ensure that table handlers gets all modifications to CFLAGS/CXXFLAGS
+export CC CXX CFLAGS CXXFLAGS LD LDFLAGS AR
+
 if test "$with_server" = "yes" -o "$THREAD_SAFE_CLIENT" != "no"
 then
   AC_DEFINE(THREAD)
diff --git a/innobase/os/os0file.c b/innobase/os/os0file.c
index 81566337218..681c4e487e7 100644
--- a/innobase/os/os0file.c
+++ b/innobase/os/os0file.c
@@ -1111,7 +1111,7 @@ os_file_pread(
 
 	os_n_file_reads++;
 
-#ifdef HAVE_PREAD
+#if defined(HAVE_PREAD) && !defined(HAVE_BROKEN_PREAD)
         os_mutex_enter(os_file_count_mutex);
 	os_file_n_pending_preads++;
         os_mutex_exit(os_file_count_mutex);
@@ -1186,7 +1186,7 @@ os_file_pwrite(
 
 	os_n_file_writes++;
 
-#ifdef HAVE_PWRITE
+#if defined(HAVE_PWRITE) && !defined(HAVE_BROKEN_PREAD)
         os_mutex_enter(os_file_count_mutex);
 	os_file_n_pending_pwrites++;
         os_mutex_exit(os_file_count_mutex);