diff options
| author | Mats Kindahl <mats@sun.com> | 2010-03-31 16:05:33 +0200 |
|---|---|---|
| committer | Mats Kindahl <mats@sun.com> | 2010-03-31 16:05:33 +0200 |
| commit | 23d8586dbfdfdf02fa2f801b9dad91db53025a64 (patch) | |
| tree | 19f32879e77ada23d733f35173a25f410d655ebe /sql/sql_connect.cc | |
| parent | d7dd2fc92f042596c2e72a96934bb207270e7419 (diff) | |
| download | mariadb-git-23d8586dbfdfdf02fa2f801b9dad91db53025a64.tar.gz | |
WL#5030: Split and remove mysql_priv.h
This patch:
- Moves all definitions from the mysql_priv.h file into
header files for the component where the variable is
defined
- Creates header files if the component lacks one
- Eliminates all include directives from mysql_priv.h
- Eliminates all circular include cycles
- Rename time.cc to sql_time.cc
- Rename mysql_priv.h to sql_priv.h
Diffstat (limited to 'sql/sql_connect.cc')
| -rw-r--r-- | sql/sql_connect.cc | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/sql/sql_connect.cc b/sql/sql_connect.cc index 90b255b0843..c454933517f 100644 --- a/sql/sql_connect.cc +++ b/sql/sql_connect.cc @@ -18,9 +18,23 @@ Functions to autenticate and handle reqests for a connection */ -#include "mysql_priv.h" +#include "sql_priv.h" +#include "my_global.h" +#ifndef __WIN__ +#include <netdb.h> // getservbyname, servent +#endif #include "sql_audit.h" +#include "sql_connect.h" +#include "my_global.h" #include "probes_mysql.h" +#include "unireg.h" // REQUIRED: for other includes +#include "sql_parse.h" // sql_command_flags, + // execute_init_command, + // do_command +#include "sql_db.h" // mysql_change_db +#include "hostname.h" // inc_host_errors, ip_to_hostname, + // reset_host_errors +#include "sql_acl.h" // acl_getroot, NO_ACCESS, SUPER_ACL #ifdef HAVE_OPENSSL /* |