diff options
| author | unknown <monty@hundin.mysql.fi> | 2002-10-16 19:05:10 +0300 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2002-10-16 19:05:10 +0300 |
| commit | baa1ddb0e7fb7bf1b4e973f0d956041df00ea64b (patch) | |
| tree | 66490ad10c369a5769b1adb2c70bad7536a903b3 /acinclude.m4 | |
| parent | ae43238f5b99018ddc4813f8548a27e79b04b339 (diff) | |
| download | mariadb-git-baa1ddb0e7fb7bf1b4e973f0d956041df00ea64b.tar.gz | |
Fixes after last merge.
Ignore changed keyblocks when on does DELETE FROM table_name;
acinclude.m4:
Don't give warnings when using openssl installed in /usr/include with gcc 3.x
myisam/mi_delete_all.c:
Ignore changed keyblocks when on does DELETE FROM table_name;
mysql-test/r/null_key.result:
Fix null test
sql/ha_innodb.cc:
Fix bug in last merge
sql/sql_parse.cc:
Fix bug introduced with merge
Diffstat (limited to 'acinclude.m4')
| -rw-r--r-- | acinclude.m4 | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 76953e3e4c2..b91c6905538 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -746,7 +746,12 @@ AC_MSG_CHECKING(for OpenSSL) AC_DEFINE(HAVE_VIO) AC_MSG_RESULT(yes) openssl_libs="-L$OPENSSL_LIB -lssl -lcrypto" - openssl_includes="-I$OPENSSL_INCLUDE" + # Don't set openssl_includes to /usr/include as this gives us a lot of + # compiler warnings when using gcc 3.x + if test "$OPENSSL_INCLUDE" != "/usr/include" + then + openssl_includes="-I$OPENSSL_INCLUDE" + fi AC_DEFINE(HAVE_OPENSSL) # openssl-devel-0.9.6 requires dlopen() and we can't link staticly |