Commit 0a09408d authored by unknown's avatar unknown
Browse files

Added pathes to mysqld_error.h and sql_state.h; fixed segfault bug; 


BitKeeper/etc/ignore:
  added extra/created_include_files
extra/Makefile.am:
  Make sure that mysqld_error.h and sql_state.h are not build in the same time.
extra/comp_err.c:
  Fixed segfault bug
libmysqld/Makefile.am:
  Added path to mysqld_error.h and sql_state.h
libmysqld/examples/Makefile.am:
  Added path to mysqld_error.h and sql_state.h
scripts/make_win_src_distribution.sh:
  Windows version fix
parent 51c2c581

.bzrignore

+1 −0
Original line number Diff line number Diff line
@@ -985,3 +985,4 @@ vio/test-sslserver 
vio/viotest-ssl

extra/mysqld_error.h

extra/sql_state.h

extra/created_include_files

extra/Makefile.am

+12 −5
Original line number Diff line number Diff line
@@ -21,12 +21,19 @@ LDADD = @CLIENT_EXTRA_LDFLAGS@ ../mysys/libmysys.a \ 
			../dbug/libdbug.a ../strings/libmystrings.a

BUILT_SOURCES=		mysqld_error.h sql_state.h

pkginclude_HEADERS=	$(BUILT_SOURCES)

created_sources = 	created_include_files

CLEANFILES =		$(created_sources)

SUPERCLEANFILES =	$(BUILT_SOURCES)



mysqld_error.h: comp_err

	$(top_builddir)/extra/comp_err --charset=$(srcdir)/../sql/share/charsets --out-dir=$(top_builddir)/sql/share/ --header_file=$(top_builddir)/extra/mysqld_error.h --state_file=$(top_builddir)/extra/sql_state.h --in_file=$(srcdir)/../sql/share/errmsg.txt

all: $(created_sources)



# This will build mysqld_error.h and sql_state.h

mysqld_error.h: created_include_files

sql_state.h:	created_include_files



sql_state.h: comp_err

created_include_files: comp_err

	$(top_builddir)/extra/comp_err --charset=$(srcdir)/../sql/share/charsets --out-dir=$(top_builddir)/sql/share/ --header_file=$(top_builddir)/extra/mysqld_error.h --state_file=$(top_builddir)/extra/sql_state.h --in_file=$(srcdir)/../sql/share/errmsg.txt

	touch created_include_files



bin_PROGRAMS =		replace comp_err perror resolveip my_print_defaults \

			resolve_stack_dump mysql_waitpid

extra/comp_err.c

+2 −7
Original line number Diff line number Diff line
@@ -156,10 +156,8 @@ int main(int argc, char *argv[]) 
    uint row_count;

    struct errors *error_head;

    struct languages *lang_head;



    DBUG_ENTER("main");

    LINT_INIT(error_head);

    LINT_INIT(lang_head);



    charsets_dir= DEFAULT_CHARSET_DIR;

    if (get_options(&argc, &argv))

      DBUG_RETURN(1);
@@ -751,13 +749,10 @@ static struct errors *parse_error_string(char *str, int er_count) 


static struct languages *parse_charset_string(char *str)

{

  struct languages *head, *new_lang;



  struct languages *head=0, *new_lang;

  DBUG_ENTER("parse_charset_string");

  DBUG_PRINT("enter", ("str: %s", str));



  LINT_INIT(head);



  /* skip over keyword */

  str= find_end_of_word(str);

  if (!*str)

libmysqld/Makefile.am

+3 −1
Original line number Diff line number Diff line
@@ -26,7 +26,9 @@ DEFS = -DEMBEDDED_LIBRARY -DMYSQL_SERVER \ 
			-DDATADIR="\"$(MYSQLDATAdir)\"" \

			-DSHAREDIR="\"$(MYSQLSHAREdir)\""

INCLUDES=		@MT_INCLUDES@ @bdb_includes@ -I$(top_srcdir)/include \

			-I$(top_srcdir)/sql -I$(top_srcdir)/sql/examples -I$(top_srcdir)/regex \

			-I$(top_srcdir)/sql -I$(top_srcdir)/sql/examples \

			-I$(top_srcdir)/regex \

			-I$(top_srcdir)/extra \

			$(openssl_includes) @ZLIB_INCLUDES@



noinst_LIBRARIES =	libmysqld_int.a

libmysqld/examples/Makefile.am

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ link_sources: 
DEFS = 		-DEMBEDDED_LIBRARY

INCLUDES =	@MT_INCLUDES@ -I$(top_srcdir)/include -I$(srcdir) \

		-I$(top_srcdir) -I$(top_srcdir)/client -I$(top_srcdir)/regex \

		$(openssl_includes)

		-I$(top_srcdir)/extra $(openssl_includes)

LIBS =		@LIBS@ @WRAPLIBS@ @CLIENT_LIBS@

LDADD =		@CLIENT_EXTRA_LDFLAGS@ ../libmysqld.a @innodb_system_libs@ @LIBDL@ $(CXXLDFLAGS)