summaryrefslogtreecommitdiff
path: root/acinclude.m4
diff options
context:
space:
mode:
authormonty@mashka.mysql.fi <>2003-04-26 20:43:28 +0300
committermonty@mashka.mysql.fi <>2003-04-26 20:43:28 +0300
commitbf6cfd2948f4cbab120a76aaf16d7ca0739cf2f4 (patch)
treed337933bf02d06131497e3097c839528e9938a07 /acinclude.m4
parentba5b57c642fccfdbac0a4b82de919dbcc2bca058 (diff)
downloadmariadb-git-bf6cfd2948f4cbab120a76aaf16d7ca0739cf2f4.tar.gz
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)
Diffstat (limited to 'acinclude.m4')
-rw-r--r--acinclude.m42
1 files changed, 1 insertions, 1 deletions
diff --git a/acinclude.m4 b/acinclude.m4
index cf0233fa38f..4d7900acc3d 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -38,7 +38,7 @@ AC_LANG_SAVE
AC_LANG_CPLUSPLUS
if test "$ac_cv_prog_gxx" = "yes"
then
- CXXFLAGS="$CXXFLAGS -Werror"
+ CXXFLAGS=`echo $CXXFLAGS -Werror | sed 's/-fbranch-probabilities//'`
fi
mysql_cv_btype_last_arg_accept=none
[AC_TRY_COMPILE([#if defined(inline)