diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-06-11 20:20:35 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-06-11 20:20:35 +0200 |
| commit | 810cf362eae28d4a096e0acea7efa67dd32aa05b (patch) | |
| tree | 4f7b2f858e8a57022e790bcac6d88b5e3451ee0f /include/mysql.h.pp | |
| parent | a99efc00a68fe2406343e63b67fc4ea58bed345a (diff) | |
| parent | d199a0ffb0aac86881ea2db7dd78bc07b438dc67 (diff) | |
| download | mariadb-git-810cf362eae28d4a096e0acea7efa67dd32aa05b.tar.gz | |
Merge branch '5.5' into 10.0
Diffstat (limited to 'include/mysql.h.pp')
| -rw-r--r-- | include/mysql.h.pp | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/include/mysql.h.pp b/include/mysql.h.pp index f2c040b694c..2c8e47b454f 100644 --- a/include/mysql.h.pp +++ b/include/mysql.h.pp @@ -1,7 +1,5 @@ typedef char my_bool; typedef int my_socket; -#include "mysql_version.h" -#include "mysql_com.h" enum enum_server_command { COM_SLEEP, COM_QUIT, COM_INIT_DB, COM_QUERY, COM_FIELD_LIST, @@ -145,7 +143,6 @@ void get_tty_password_buff(const char *opt_message, char *to, size_t length); const char *mysql_errno_to_sqlstate(unsigned int mysql_errno); my_bool my_thread_init(void); void my_thread_end(void); -#include "mysql_time.h" typedef long my_time_t; enum enum_mysql_timestamp_type { @@ -159,7 +156,6 @@ typedef struct st_mysql_time my_bool neg; enum enum_mysql_timestamp_type time_type; } MYSQL_TIME; -#include "my_list.h" typedef struct st_list { struct st_list *prev,*next; void *data; @@ -201,8 +197,6 @@ typedef struct st_mysql_field { typedef char **MYSQL_ROW; typedef unsigned int MYSQL_FIELD_OFFSET; typedef unsigned long long my_ulonglong; -#include "typelib.h" -#include "my_alloc.h" typedef struct st_used_mem { struct st_used_mem *next; @@ -246,7 +240,6 @@ typedef struct st_mysql_rows { unsigned long length; } MYSQL_ROWS; typedef MYSQL_ROWS *MYSQL_ROW_OFFSET; -#include "my_alloc.h" typedef struct embedded_query_result EMBEDDED_QUERY_RESULT; typedef struct st_mysql_data { MYSQL_ROWS *data; |