Portability fixes

BitKeeper/deleted/.del-compile-ia64-O0-sgicc~a4e0732013d6b602:
  Delete: BUILD/compile-ia64-O0-sgicc
BitKeeper/deleted/.del-compile-ia64-O0~3a41dfebefc817d1:
  Delete: BUILD/compile-ia64-O0
BitKeeper/deleted/.del-compile-ia64-O2-sgicc~6ff796ecac337849:
  Delete: BUILD/compile-ia64-O2-sgicc
BitKeeper/deleted/.del-compile-ia64-O2~87d13594c3599830:
  Delete: BUILD/compile-ia64-O2
BitKeeper/deleted/.del-compile-ia64-O6~c34e6b943b12c468:
  Delete: BUILD/compile-ia64-O6
Docs/manual.texi:
  Cleanup
mysql-test/r/rpl000014.result:
  Change port number for comparison
mysql-test/r/rpl000015.result:
  Change port number for comparison
mysql-test/r/rpl000016.result:
  Change port number for comparison
mysql-test/t/rpl000014.test:
  Change port number for comparison
mysql-test/t/rpl000015.test:
  Change port number for comparison
mysql-test/t/rpl000016.test:
  Change port number for comparison
sql-bench/Results/ATIS-mysql-NT_4.0:
  New test results
sql-bench/Results/RUN-mysql-NT_4.0:
  New test results
sql-bench/Results/alter-table-mysql-NT_4.0:
  New test results
sql-bench/Results/big-tables-mysql-NT_4.0:
  New test results
sql-bench/Results/connect-mysql-NT_4.0:
  New test results
sql-bench/Results/create-mysql-NT_4.0:
  New test results
sql-bench/Results/insert-mysql-NT_4.0:
  New test results
sql-bench/Results/select-mysql-NT_4.0:
  New test results
sql-bench/Results/wisconsin-mysql-NT_4.0:
  New test results
sql/slave.cc:
  Removed not used variable

7 files changed, 15 insertions, 15 deletions

diff --git a/innobase/configure.in b/innobase/configure.in
index b2fa034479b..9d25255b52c 100644
--- a/innobase/configure.in
+++ b/innobase/configure.in
@@ -10,7 +10,7 @@ AC_PROG_INSTALL
 AC_CHECK_HEADERS(aio.h sched.h)
 AC_CHECK_SIZEOF(int, 4)
 AC_CHECK_FUNCS(sched_yield)
-AC_C_INLINE
+#AC_C_INLINE  Already checked in MySQL
 AC_C_BIGENDIAN
 
 # Build optimized or debug version ?
@@ -56,10 +56,13 @@ else
 fi
 
 case "$target_os" in
-       hp*) AC_DEFINE(UNIV_MUST_NOT_INLINE, 1,
-	                     No inlining because gcc broken on HP-UX);;
-       *sgi-irix*) AC_DEFINE(UNIV_MUST_NOT_INLINE, 1,
-	                     No inlining because cc broken on irix);;
+       hp*)
+	 CFLAGS="$CFLAGS -DUNIV_MUST_NOT_INLINE";;
+       irix*)
+	 CFLAGS="$CFLAGS -DUNIV_MUST_NOT_INLINE";;
+       sysv5uw7*)
+	 # Problem when linking on SCO
+	 CFLAGS="$CFLAGS -DUNIV_MUST_NOT_INLINE";;
 esac
 
 AC_OUTPUT(Makefile os/Makefile ut/Makefile btr/Makefile
diff --git a/innobase/include/ut0dbg.h b/innobase/include/ut0dbg.h
index a36b022e036..751609b244e 100644
--- a/innobase/include/ut0dbg.h
+++ b/innobase/include/ut0dbg.h
@@ -9,9 +9,9 @@ Created 1/30/1994 Heikki Tuuri
 #ifndef ut0dbg_h
 #define ut0dbg_h
 
+#include "univ.i"
 #include <assert.h>
 #include <stdlib.h>
-#include "univ.i"
 #include "os0thread.h"
 
 extern ulint	ut_dbg_zero; /* This is used to eliminate
diff --git a/innobase/include/ut0mem.h b/innobase/include/ut0mem.h
index 4d266f34c17..fa46514fe16 100644
--- a/innobase/include/ut0mem.h
+++ b/innobase/include/ut0mem.h
@@ -9,9 +9,9 @@ Created 5/30/1994 Heikki Tuuri
 #ifndef ut0mem_h
 #define ut0mem_h
 
+#include "univ.i"
 #include <string.h>
 #include <stdlib.h>
-#include "univ.i"
 
 UNIV_INLINE
 void*
diff --git a/innobase/include/ut0ut.h b/innobase/include/ut0ut.h
index 05d4f455c58..f2c4781c167 100644
--- a/innobase/include/ut0ut.h
+++ b/innobase/include/ut0ut.h
@@ -9,10 +9,9 @@ Created 1/20/1994 Heikki Tuuri
 #ifndef ut0ut_h
 #define ut0ut_h
 
-#include <time.h>
-#include <ctype.h>
-
 #include "univ.i"
+#include <time.h>
+#include <m_ctype.h>
 
 
 typedef time_t	ib_time_t;
diff --git a/innobase/pars/lexyy.c b/innobase/pars/lexyy.c
index 6ba8ecfbcb1..64b8963028b 100644
--- a/innobase/pars/lexyy.c
+++ b/innobase/pars/lexyy.c
@@ -6,6 +6,7 @@
 
 #define FLEX_SCANNER
 
+#include "univ.i"
 #include <stdio.h>
 
 
@@ -5850,7 +5851,6 @@ Created 12/14/1997 Heikki Tuuri
 *******************************************************/
 #define YYSTYPE que_node_t*
 
-#include "univ.i"
 #include "pars0pars.h"
 #include "pars0grm.h"
 #include "pars0sym.h"
diff --git a/innobase/pars/pars0grm.c b/innobase/pars/pars0grm.c
index e7317d1f030..7f629a8fe4c 100644
--- a/innobase/pars/pars0grm.c
+++ b/innobase/pars/pars0grm.c
@@ -97,9 +97,8 @@ que_node_t */
 #define YYSTYPE que_node_t*
 #define alloca	mem_alloc
 
-#include <math.h>
-
 #include "univ.i"
+#include <math.h>
 #include "pars0pars.h"
 #include "mem0mem.h"
 #include "que0types.h"
diff --git a/innobase/pars/pars0grm.y b/innobase/pars/pars0grm.y
index a13aeaac1e2..681454f1d72 100644
--- a/innobase/pars/pars0grm.y
+++ b/innobase/pars/pars0grm.y
@@ -12,9 +12,8 @@ que_node_t */
 #define YYSTYPE que_node_t*
 #define alloca	mem_alloc
 
-#include <math.h>
-
 #include "univ.i"
+#include <math.h>
 #include "pars0pars.h"
 #include "mem0mem.h"
 #include "que0types.h"