summaryrefslogtreecommitdiff
path: root/sql/sql_acl.h
diff options
context:
space:
mode:
authorMats Kindahl <mats@sun.com>2010-04-07 13:58:40 +0200
committerMats Kindahl <mats@sun.com>2010-04-07 13:58:40 +0200
commit46bd78b9ee82b5b51239497445bc55e566e59b07 (patch)
tree2f3a5f2cd336f0187f122dc5818b89361570f074 /sql/sql_acl.h
parente92b3c587ced3e4104f2ab2ee38168d2b8c8bfb5 (diff)
downloadmariadb-git-46bd78b9ee82b5b51239497445bc55e566e59b07.tar.gz
WL#5030: Splitting mysql_priv.h
Adding my_global.h first in all files using NO_EMBEDDED_ACCESS_CHECKS. Correcting a merge problem resulting from a changed definition of check_some_access compared to the original patches.
Diffstat (limited to 'sql/sql_acl.h')
-rw-r--r--sql/sql_acl.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/sql_acl.h b/sql/sql_acl.h
index 1cbbedfe226..c0b536b7740 100644
--- a/sql/sql_acl.h
+++ b/sql/sql_acl.h
@@ -16,6 +16,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
+#include "my_global.h" /* NO_EMBEDDED_ACCESS_CHECKS */
#include "violite.h" /* SSL_type */
#include "sql_class.h" /* LEX_COLUMN */