diff options
| author | unknown <anjuta@arthur.local> | 2004-12-14 01:54:16 +0200 |
|---|---|---|
| committer | unknown <anjuta@arthur.local> | 2004-12-14 01:54:16 +0200 |
| commit | 0a09408da22189597da42cf7fd7bed2a02dfc73b (patch) | |
| tree | 3c7e9bf79f20247dcb163ed6b61b5242fd9cbf63 /extra | |
| parent | 51c2c581f1e54d690ea857524384d58bdb0b8cde (diff) | |
| download | mariadb-git-0a09408da22189597da42cf7fd7bed2a02dfc73b.tar.gz | |
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
Diffstat (limited to 'extra')
| -rw-r--r-- | extra/Makefile.am | 17 | ||||
| -rw-r--r-- | extra/comp_err.c | 9 |
2 files changed, 14 insertions, 12 deletions
diff --git a/extra/Makefile.am b/extra/Makefile.am index 1ca7c9fb692..7bb401f0729 100644 --- a/extra/Makefile.am +++ b/extra/Makefile.am @@ -19,14 +19,21 @@ INCLUDES = @MT_INCLUDES@ -I$(top_srcdir)/include \ -I$(top_srcdir)/extra 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) +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 diff --git a/extra/comp_err.c b/extra/comp_err.c index fb5da3a066a..9bd0a1ec7a2 100644 --- a/extra/comp_err.c +++ b/extra/comp_err.c @@ -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) |