diff options
| author | Mats Kindahl <mats@sun.com> | 2010-04-07 13:58:40 +0200 |
|---|---|---|
| committer | Mats Kindahl <mats@sun.com> | 2010-04-07 13:58:40 +0200 |
| commit | 0768deeb2707ac1b0f5061237ed02faa976381e7 (patch) | |
| tree | 2f3a5f2cd336f0187f122dc5818b89361570f074 /sql/mysqld.cc | |
| parent | 2c79d4d02b46d76f1aa19070d741bb3cc59adcfe (diff) | |
| download | mariadb-git-0768deeb2707ac1b0f5061237ed02faa976381e7.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/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index e8e7b5bb3ef..2bc47849915 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -13,9 +13,9 @@ 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 "sql_priv.h" #include "unireg.h" -#include "my_global.h" #include <signal.h> #ifndef __WIN__ #include <netdb.h> // getservbyname, servent |