summaryrefslogtreecommitdiff
path: root/sql/item_strfunc.cc
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
commit4341e1543d125dac64223bc1c6bb617f70513b1c (patch)
tree2420ece2919824dc5183a5aa772da0153ad2a123 /sql/item_strfunc.cc
parent55e36215a56f73bbb1d87a41e51e9555e6e65bde (diff)
downloadmariadb-git-4341e1543d125dac64223bc1c6bb617f70513b1c.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 'sql/item_strfunc.cc')
-rw-r--r--sql/item_strfunc.cc3
1 files changed, 0 insertions, 3 deletions
diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc
index af4e2a01eae..29165d85451 100644
--- a/sql/item_strfunc.cc
+++ b/sql/item_strfunc.cc
@@ -27,9 +27,6 @@
#include "mysql_priv.h"
#include "sql_acl.h"
#include <m_ctype.h>
-#ifdef HAVE_CRYPT_H
-#include <crypt.h>
-#endif
#ifdef HAVE_OPENSSL
#include <openssl/des.h>
#endif /* HAVE_OPENSSL */