diff --git a/configure.in b/configure.in
index c00bbf60b60..7d538c77fc5 100644
--- a/configure.in
+++ b/configure.in
@@ -2657,6 +2657,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/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
 
diff --git a/innobase/os/os0file.c b/innobase/os/os0file.c
index 5f5060c7464..a27da6d870e 100644
--- a/innobase/os/os0file.c
+++ b/innobase/os/os0file.c
@@ -1740,7 +1740,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);
@@ -1815,7 +1815,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);
diff --git a/mysql-test/r/variables.result b/mysql-test/r/variables.result
index 33adfe548da..fbd9664ba9d 100644
--- a/mysql-test/r/variables.result
+++ b/mysql-test/r/variables.result
@@ -385,7 +385,6 @@ select 1;
 1
 1
 select @@session.key_buffer_size;
-ERROR HY000: Variable 'key_buffer_size' is a GLOBAL variable
 set ft_boolean_syntax = @@init_connect;
 ERROR HY000: Variable 'ft_boolean_syntax' is a GLOBAL variable and should be set with SET GLOBAL
 set global ft_boolean_syntax = @@init_connect;
@@ -400,7 +399,7 @@ ERROR 42000: Variable 'ft_boolean_syntax' can't be set to the value of ''
 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
 set global myisam_max_sort_file_size=default;
 select @@global.max_user_connections,@@local.max_join_size;
 @@global.max_user_connections	@@session.max_join_size
diff --git a/mysql-test/t/variables.test b/mysql-test/t/variables.test
index a1faa4a4f71..60ebeb045f5 100644
--- a/mysql-test/t/variables.test
+++ b/mysql-test/t/variables.test
@@ -291,6 +291,7 @@ set global ft_boolean_syntax = @@init_connect;
 # 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';
 set global myisam_max_sort_file_size=default;