From bf6cfd2948f4cbab120a76aaf16d7ca0739cf2f4 Mon Sep 17 00:00:00 2001
From: "monty@mashka.mysql.fi" <>
Date: Sat, 26 Apr 2003 20:43:28 +0300
Subject: Fix for -fbranch-probabilites (bug 268) Fix for LEFT/RIGHT/MID with
 multi-byte-character sets (bug 314) Fix for new bison 1.875
 max_insert_delayed_threads and delayed_insert_timeout now works as documented
 (bug 211) Don't show port in SHOW PROCESSLIST for system threads Fix problem
 with ORDER BY being discarded for some DISTINCT queries (bug 275) Fixed bug
 with NATURAL LEFT JOIN, NATURAL RIGHT JOIN and RIGHT JOIN when using many
 joined tables (Bug 212)

---
 configure.in | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'configure.in')

diff --git a/configure.in b/configure.in
index aea415a13c4..a1ea566435b 100644
--- a/configure.in
+++ b/configure.in
@@ -1862,7 +1862,7 @@ AC_LANG_SAVE
 AC_LANG_CPLUSPLUS
 if test "$ac_cv_prog_gxx" = "yes" -a "$with_other_libc" = "no"
 then
-  CXXFLAGS="$CXXFLAGS -Werror"
+  CXXFLAGS=`echo "$CXXFLAGS -Werror" | sed 's/-fbranch-probabilities//'`
 fi
 AC_TRY_COMPILE(
 [#undef inline
@@ -1894,7 +1894,7 @@ AC_LANG_SAVE
 AC_LANG_CPLUSPLUS
 if test "$ac_cv_prog_gxx" = "yes" -a "$with_other_libc" = "no"
 then
-  CXXFLAGS="$CXXFLAGS -Werror"
+  CXXFLAGS=`echo "$CXXFLAGS -Werror" | sed 's/-fbranch-probabilities//'`
 fi
 AC_TRY_COMPILE(
 [#undef inline
@@ -2341,7 +2341,7 @@ extern int     mbcharlen_${c}(uint);"
     mbcharlen_${c}"
   else
     CHARSET_COMP_CS_INIT="$CHARSET_COMP_CS_INIT
-    0,          /* mbmaxlen  */
+    1,          /* mbmaxlen  */
     NULL,       /* ismbchar  */
     NULL,       /* ismbhead  */
     NULL        /* mbcharlen */"
-- 
cgit v1.2.1


From 3e72b423e39702fddca1f345d61069fe9b1343e3 Mon Sep 17 00:00:00 2001
From: "monty@narttu.mysql.fi" <>
Date: Wed, 14 May 2003 01:27:26 +0300
Subject: Fix for MacOSX and symlinks Fix for USE_FRM and crashed index file

---
 configure.in | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'configure.in')

diff --git a/configure.in b/configure.in
index a1ea566435b..3b00f5343ce 100644
--- a/configure.in
+++ b/configure.in
@@ -1007,8 +1007,9 @@ case $SYSTEM_TYPE in
   *darwin5*)
     if test "$ac_cv_prog_gcc" = "yes"
     then
-      CFLAGS="$CFLAGS -traditional-cpp -DHAVE_DARWIN_THREADS -D_P1003_1B_VISIBLE -DSIGNAL_WITH_VIO_CLOSE -DSIGNALS_DONT_BREAK_READ -DHAVE_BROKEN_REALPATH -DFN_NO_CASE_SENCE"
-      CXXFLAGS="$CXXFLAGS -traditional-cpp -DHAVE_DARWIN_THREADS -D_P1003_1B_VISIBLE -DSIGNAL_WITH_VIO_CLOSE -DSIGNALS_DONT_BREAK_READ -DFN_NO_CASE_SENCE"
+      FLAGS="-traditional-cpp -DHAVE_DARWIN_THREADS -D_P1003_1B_VISIBLE -DSIGNAL_WITH_VIO_CLOSE -DSIGNALS_DONT_BREAK_READ -DHAVE_BROKEN_REALPATH -DFN_NO_CASE_SENCE"
+      CFLAGS="$CFLAGS $FLAGS"
+      CXXFLAGS="$CXXFLAGS $FLAGS"
       MAX_C_OPTIMIZE="-O"
       with_named_curses=""
     fi
@@ -1016,8 +1017,9 @@ case $SYSTEM_TYPE in
   *darwin6*)
     if test "$ac_cv_prog_gcc" = "yes"
     then
-      CFLAGS="$CFLAGS -traditional-cpp -DHAVE_DARWIN_THREADS -D_P1003_1B_VISIBLE -DSIGNAL_WITH_VIO_CLOSE -DSIGNALS_DONT_BREAK_READ -DHAVE_BROKEN_REALPATH -DFN_NO_CASE_SENCE"
-      CXXFLAGS="$CXXFLAGS -traditional-cpp -DHAVE_DARWIN_THREADS -D_P1003_1B_VISIBLE -DSIGNAL_WITH_VIO_CLOSE -DSIGNALS_DONT_BREAK_READ -DFN_NO_CASE_SENCE"
+      FLAGS="-traditional-cpp -DHAVE_DARWIN_THREADS -D_P1003_1B_VISIBLE -DSIGNAL_WITH_VIO_CLOSE -DSIGNALS_DONT_BREAK_READ -DHAVE_BROKEN_REALPATH -DFN_NO_CASE_SENCE"
+      CFLAGS="$CFLAGS $FLAGS"
+      CXXFLAGS="$CXXFLAGS $FLAGS"
       MAX_C_OPTIMIZE="-O"
     fi
     ;;
-- 
cgit v1.2.1


From cf99d899084c47d248d42cb38be522321a9806e1 Mon Sep 17 00:00:00 2001
From: "monty@narttu.mysql.fi" <>
Date: Wed, 14 May 2003 22:08:30 +0300
Subject: Portability fixes OpenUnix 8 & UnixWare 7.1.x

---
 configure.in | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'configure.in')

diff --git a/configure.in b/configure.in
index cc6f3a79b69..5b690c3af78 100644
--- a/configure.in
+++ b/configure.in
@@ -1170,10 +1170,8 @@ then
       with_named_thread="-Kthread -lsocket -lnsl"
       if expr "$SYSTEM_TYPE" : ".*unixware7.0.0" > /dev/null
       then
-#        AC_DEFINE(HAVE_OpenUNIX8_THREADS)
         AC_DEFINE(HAVE_UNIXWARE7_THREADS)
       else
-#        AC_DEFINE(HAVE_OpenUNIX8_POSIX)
         AC_DEFINE(HAVE_UNIXWARE7_POSIX)
       fi
       # We must have cc
@@ -1182,10 +1180,8 @@ then
       then
 	{ echo "configure: error: On OpenUNIX8 and UnixWare7 MySQL must be compiled with cc. See the Installation chapter in the Reference Manual." 1>&2; exit 1; };
       else
-#	CC="$CC -Kthread -DOpenUNIX8";
-#	CXX="$CXX -Kthread -DOpenUNIX8";
-	CC="$CC -Kthread -DUNIXWARE_7";
-	CXX="$CXX -Kthread -DUNIXWARE_7";
+ 	CC="$CC -Kthread -DUNIXWARE_7 -DHAVE_BROKEN_RWLOCK";
+ 	CXX="$CXX -Kthread -DUNIXWARE_7 -DHAVE_BROKEN_RWLOCK";
       fi
       AC_MSG_RESULT("yes")
     else
-- 
cgit v1.2.1