diff options
| author | Monty <monty@mariadb.org> | 2016-10-02 16:39:40 +0300 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2016-10-05 01:11:08 +0300 |
| commit | 7b96416f3c43f02240864f378513330b85f49521 (patch) | |
| tree | e4fa5f570965d5cc36e983275e08f36431a4a654 /sql/mysqld.h | |
| parent | 8be53a389c8eebed337057fa366b7c4506ba16b1 (diff) | |
| download | mariadb-git-7b96416f3c43f02240864f378513330b85f49521.tar.gz | |
Use sql_mode_t for sql_mode.
This fixed several cases where we where using just ulong for sql_mode
Diffstat (limited to 'sql/mysqld.h')
| -rw-r--r-- | sql/mysqld.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/mysqld.h b/sql/mysqld.h index 83d723c6ab7..294b463161b 100644 --- a/sql/mysqld.h +++ b/sql/mysqld.h @@ -17,7 +17,8 @@ #ifndef MYSQLD_INCLUDED #define MYSQLD_INCLUDED -#include "my_global.h" /* MYSQL_PLUGIN_IMPORT, FN_REFLEN, FN_EXTLEN */ +#include <my_global.h> /* MYSQL_PLUGIN_IMPORT, FN_REFLEN, FN_EXTLEN */ +#include "sql_basic_types.h" /* query_id_t */ #include "sql_bitmap.h" /* Bitmap */ #include "my_decimal.h" /* my_decimal */ #include "mysql_com.h" /* SERVER_VERSION_LENGTH */ @@ -698,7 +699,6 @@ enum enum_query_type /* query_id */ -typedef int64 query_id_t; extern query_id_t global_query_id; void unireg_end(void) __attribute__((noreturn)); |