summaryrefslogtreecommitdiff
path: root/include/mysql.h.pp
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2015-06-03 09:54:56 +0200
committerSergei Golubchik <serg@mariadb.org>2015-06-03 09:54:56 +0200
commit0ffef5d2a72bad8fe0cb72b78e426f4f50a29bf2 (patch)
tree06b03c0510b4d23b0cf0bffa8d54593028004ebe /include/mysql.h.pp
parent8e7d6652adda0eaa0ce095b5c2258d5be61487fd (diff)
downloadmariadb-git-0ffef5d2a72bad8fe0cb72b78e426f4f50a29bf2.tar.gz
MDEV-8052 abi detection incorrect with clang
don't include #include directives into .pp files
Diffstat (limited to 'include/mysql.h.pp')
-rw-r--r--include/mysql.h.pp7
1 files changed, 0 insertions, 7 deletions
diff --git a/include/mysql.h.pp b/include/mysql.h.pp
index f6be582c0da..4f7407095c9 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,
@@ -142,7 +140,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"
enum enum_mysql_timestamp_type
{
MYSQL_TIMESTAMP_NONE= -2, MYSQL_TIMESTAMP_ERROR= -1,
@@ -155,7 +152,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;
@@ -197,8 +193,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;
@@ -242,7 +236,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;