Commit 83f6429c authored by unknown's avatar unknown
Browse files

Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-5.0 

into hundin.mysql.fi:/home/jan/mysql-5.0
parents 795a8c82 0a09408d

.bzrignore

+3 −0
Original line number Diff line number Diff line
@@ -983,3 +983,6 @@ vio/test-ssl 
vio/test-sslclient

vio/test-sslserver

vio/viotest-ssl

extra/mysqld_error.h

extra/sql_state.h

extra/created_include_files

BitKeeper/etc/logging_ok

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ acurtis@pcgem.rdg.cyberkinetica.com 
administrador@light.hegel.local

ahlentz@co3064164-a.rochd1.qld.optusnet.com.au

akishkin@work.mysql.com

anjuta@arthur.local

antony@ltantony.dsl-verizon.net

antony@ltantony.rdg.cyberkinetica.com

antony@ltantony.rdg.cyberkinetica.homeunix.net

client/Makefile.am

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 


#AUTOMAKE_OPTIONS =              nostdinc

INCLUDES =			-I$(top_srcdir)/include -I$(top_srcdir)/regex \

				$(openssl_includes)

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

LIBS =				@CLIENT_LIBS@

DEPLIB=				../libmysql/libmysqlclient.la

LDADD =				@CLIENT_EXTRA_LDFLAGS@ $(DEPLIB)

extra/Makefile.am

+18 −1
Original line number Diff line number Diff line
@@ -15,9 +15,26 @@ 
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA



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

			@ndbcluster_includes@ -I$(top_srcdir)/sql

			@ndbcluster_includes@ -I$(top_srcdir)/sql \

			-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)

created_sources = 	created_include_files

CLEANFILES =		$(created_sources)

SUPERCLEANFILES =	$(BUILT_SOURCES)



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



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

noinst_PROGRAMS =	charset2html

extra/comp_err.c

+837 −210

File changed.

Preview size limit exceeded, changes collapsed.