Commit 9d04dee3 authored by unknown's avatar unknown
Browse files

Merge shellback.(none):/home/msvensson/mysql/bug19738/my51-bug19738 

into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint


extra/Makefile.am:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
storage/innobase/Makefile.am:
  Auto merged
storage/innobase/handler/ha_innodb.cc:
  Auto merged
parents 35af88b7 fb63fdb9

extra/Makefile.am

+8 −3
Original line number Diff line number Diff line
@@ -22,11 +22,16 @@ BUILT_SOURCES= $(top_builddir)/include/mysqld_error.h \ 
                        $(top_builddir)/include/sql_state.h \

                        $(top_builddir)/include/mysqld_ername.h

pkginclude_HEADERS=	$(BUILT_SOURCES)

CLEANFILES =		$(BUILT_SOURCES)

DISTCLEANFILES =	$(BUILT_SOURCES)

SUBDIRS =		@yassl_dir@



# This will build mysqld_error.h and sql_state.h

$(top_builddir)/include/mysqld_error.h: comp_err$(EXEEXT)

# This will build mysqld_error.h, mysqld_ername.h and sql_state.h

# NOTE Built files should depend on their sources to avoid

# the built files being rebuilt in source dist

$(top_builddir)/include/mysqld_error.h: comp_err.c \

			$(top_srcdir)/sql/share/errmsg.txt \

			$(wildcard $(top_srcdir)/sql/share/charsets/*.xml)

	$(MAKE) $(AM_MAKEFLAGS) comp_err$(EXEEXT)

	$(top_builddir)/extra/comp_err$(EXEEXT) \

	--charset=$(top_srcdir)/sql/share/charsets \

	--out-dir=$(top_builddir)/sql/share/ \

sql/Makefile.am

+5 −1
Original line number Diff line number Diff line
@@ -156,7 +156,11 @@ sql_yacc.o: sql_yacc.cc sql_yacc.h $(HEADERS) 
		@echo "If it fails, re-run configure with --with-low-memory"

		$(CXXCOMPILE) $(LM_CFLAGS) -c $<



lex_hash.h:	gen_lex_hash$(EXEEXT)

# This generates lex_hash.h

# NOTE Built sources should depend on their sources not the tool

# this avoid the rebuild of the built files in a source dist

lex_hash.h:	gen_lex_hash.cc lex.h

		$(MAKE) $(AM_MAKEFLAGS) gen_lex_hash$(EXEEXT)

		./gen_lex_hash$(EXEEXT) > $@



# the following three should eventually be moved out of this directory