Commit c5095f77 authored by Narayanan V's avatar Narayanan V
Browse files

WL#4380 

1) Disabled abi_check rule for all compilers except gcc
2) restored the -dI option to retain the header information.
parent a9775e85

Makefile.am

+2 −2
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ dist-hook: 
		--datadir=$(distdir)/win/data \

		--srcdir=$(top_srcdir)



all-local:		abi_check

all-local:		@ABI_CHECK@	



tags:

	support-files/build-tags
@@ -292,7 +292,7 @@ abi_check_all: $(TEST_PREPROCESSOR_HEADER) 
do_abi_check:

	set -ex; \

	for file in $(abi_headers); do \

	         @CC@ -E -nostdinc \

	         @CC@ -E -nostdinc -dI \

	                  -I$(top_srcdir)/include \

	                  -I$(top_srcdir)/include/mysql \

	                  -I$(top_srcdir)/sql \

configure.in

+9 −0
Original line number Diff line number Diff line
@@ -444,6 +444,15 @@ AC_SUBST(HOSTNAME) 
AC_SUBST(PERL)

AC_SUBST(PERL5)



if expr "$CC" : ".*gcc.*"

then

  ABI_CHECK="abi_check"

else

  ABI_CHECK=""

fi



AC_SUBST(ABI_CHECK)



# Lock for PS

AC_PATH_PROG(PS, ps, ps)

AC_MSG_CHECKING("how to check if pid exists")

include/mysql.h.pp

+8 −0
Original line number Diff line number Diff line 
#include <sys/types.h>

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,
@@ -143,6 +146,7 @@ char *get_tty_password(const char *opt_message); 
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,6 +159,7 @@ 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;
@@ -195,6 +200,8 @@ 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;
@@ -232,6 +239,7 @@ 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;