diff options
| author | Michael Widenius <monty@mariadb.org> | 2017-06-18 06:42:16 +0300 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-08-24 01:05:44 +0200 |
| commit | 4aaa38d26ed95127b8424100c8a14c77af15fc11 (patch) | |
| tree | fd96b83db1e58971f25b7a27239b07cdca0f0793 /sql-common | |
| parent | b0da8897b08b0717ccae418f880b5ab0f5960312 (diff) | |
| download | mariadb-git-4aaa38d26ed95127b8424100c8a14c77af15fc11.tar.gz | |
Enusure that my_global.h is included first
- Added sql/mariadb.h file that should be included first by files in sql
directory, if sql_plugin.h is not used (sql_plugin.h adds SHOW variables
that must be done before my_global.h is included)
- Removed a lot of include my_global.h from include files
- Removed include's of some files that my_global.h automatically includes
- Removed duplicated include's of my_sys.h
- Replaced include my_config.h with my_global.h
Diffstat (limited to 'sql-common')
| -rw-r--r-- | sql-common/my_time.c | 1 | ||||
| -rw-r--r-- | sql-common/my_user.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/sql-common/my_time.c b/sql-common/my_time.c index 5571b87e08a..4f415d83573 100644 --- a/sql-common/my_time.c +++ b/sql-common/my_time.c @@ -15,6 +15,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <my_global.h> #include <my_time.h> #include <m_string.h> #include <m_ctype.h> diff --git a/sql-common/my_user.c b/sql-common/my_user.c index a486f77bc1e..712101b471f 100644 --- a/sql-common/my_user.c +++ b/sql-common/my_user.c @@ -14,6 +14,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <my_global.h> #include <my_user.h> #include <m_string.h> #include <mysql_com.h> |