diff options
| author | Jon Olav Hauglid <jon.hauglid@sun.com> | 2010-04-20 10:51:50 +0200 |
|---|---|---|
| committer | Jon Olav Hauglid <jon.hauglid@sun.com> | 2010-04-20 10:51:50 +0200 |
| commit | ac7873663866e74fb7572c0b2a5f2548a2897420 (patch) | |
| tree | 3c10718d95da445db1e1f9405aa01297659a8739 /sql/frm_crypt.cc | |
| parent | afdf0f030c342e28c5cfd7220e55830b18424de3 (diff) | |
| parent | 1a3c03dbb49cfc9ae8246957c5b0ac2a9389d28e (diff) | |
| download | mariadb-git-ac7873663866e74fb7572c0b2a5f2548a2897420.tar.gz | |
merge from mysql-trunk-bugfixing
Diffstat (limited to 'sql/frm_crypt.cc')
| -rw-r--r-- | sql/frm_crypt.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/frm_crypt.cc b/sql/frm_crypt.cc index 590205e83ab..821e61c5247 100644 --- a/sql/frm_crypt.cc +++ b/sql/frm_crypt.cc @@ -21,7 +21,8 @@ ** mysql binary. */ -#include "mysql_priv.h" +#include "sql_priv.h" +#include "frm_crypt.h" #ifdef HAVE_CRYPTED_FRM |