summaryrefslogtreecommitdiff
path: root/include/my_global.h
diff options
context:
space:
mode:
authorunknown <monty@mashka.mysql.fi>2003-04-28 10:32:56 +0300
committerunknown <monty@mashka.mysql.fi>2003-04-28 10:32:56 +0300
commita34fc634658ce1b2ba63a45ee6bad4355a390439 (patch)
tree2420ece2919824dc5183a5aa772da0153ad2a123 /include/my_global.h
parent31dc4b3c83917c48ee4882add75143a273a0c98b (diff)
downloadmariadb-git-a34fc634658ce1b2ba63a45ee6bad4355a390439.tar.gz
Fix for openssl on Solaris
Fix for grant bug with SELECT * include/my_global.h: Fix for openssl on Solaris sql/item_strfunc.cc: Fix for openssl on Solaris sql/sql_acl.cc: Indentation cleanup sql/sql_base.cc: Fix for grant bug with SELECT * sql/sql_parse.cc: Added comment tests/grant.pl: New grant test for SELECT * tests/grant.res: new grant results
Diffstat (limited to 'include/my_global.h')
-rw-r--r--include/my_global.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/include/my_global.h b/include/my_global.h
index e12a7d7273b..b979cd5955a 100644
--- a/include/my_global.h
+++ b/include/my_global.h
@@ -267,6 +267,10 @@ C_MODE_END
#include <asm/atomic.h>
#endif
#include <errno.h> /* Recommended by debian */
+/* We need the following to go around a problem with openssl on solaris */
+#if defined(HAVE_CRYPT)
+#include <crypt.h>
+#endif
/* Go around some bugs in different OS and compilers */
#if defined(_HPUX_SOURCE) && defined(HAVE_SYS_STREAM_H)