Commit 852bdc61 authored by unknown's avatar unknown
Browse files

Merge bk-internal:/home/bk/mysql-5.0 

into serg.mylan:/usr/home/serg/Abk/mysql-5.0
parents b59aa1aa 5c3c4079

.bzrignore

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

vio/test-sslserver

vio/viotest-ssl

include/mysqld_ername.h

include/mysqld_error.h

include/sql_state.h

Docs/Images/Makefile.am

+0 −4
Original line number Diff line number Diff line
@@ -27,9 +27,5 @@ EXTRA_DIST = 
all:

	:



# Nothing to cleanup in this dummy directory.

clean:

	:



# Don't update the files from bitkeeper

%::SCCS/s.%

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) -I$(top_srcdir)/extra

				$(openssl_includes) -I$(top_builddir)/include

LIBS =				@CLIENT_LIBS@

LDADD=				@CLIENT_EXTRA_LDFLAGS@ \

                                $(top_builddir)/libmysql/libmysqlclient.la

dbug/Makefile.am

+1 −3
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ EXTRA_DIST = example1.c example2.c example3.c \ 
NROFF_INC =             example1.r example2.r example3.r main.r \

                        factorial.r output1.r output2.r output3.r \

                        output4.r output5.r

CLEANFILES =            $(NROFF_INC) user.t user.ps





# Must be linked with libs that are not compiled yet
@@ -59,8 +60,5 @@ output5.r: factorial 
		@RM@ -f $@

		@SED@ -e 's!\\!\\\\!g' $< > $@



clean:

		@RM@ -f $(NROFF_INC) user.t user.ps



# Don't update the files from bitkeeper

%::SCCS/s.%

extra/Makefile.am

+15 −14
Original line number Diff line number Diff line
@@ -16,25 +16,26 @@ 


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

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

			-I$(top_srcdir)/extra

			-I$(top_builddir)/include

LDADD =			@CLIENT_EXTRA_LDFLAGS@ ../mysys/libmysys.a \

			../dbug/libdbug.a ../strings/libmystrings.a

BUILT_SOURCES=		mysqld_error.h sql_state.h mysqld_ername.h

BUILT_SOURCES=		$(top_builddir)/include/mysqld_error.h \

                        $(top_builddir)/include/sql_state.h \

                        $(top_builddir)/include/mysqld_ername.h

pkginclude_HEADERS=	$(BUILT_SOURCES)

created_sources = 	created_include_files

CLEANFILES =		$(created_sources)

SUPERCLEANFILES =	$(BUILT_SOURCES)



all: $(created_sources)

CLEANFILES =		$(BUILT_SOURCES)



# This will build mysqld_error.h and sql_state.h

mysqld_error.h: created_include_files

mysqld_ername.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 --name_file=$(top_builddir)/extra/mysqld_ername.h --state_file=$(top_builddir)/extra/sql_state.h --in_file=$(srcdir)/../sql/share/errmsg.txt

	touch created_include_files

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

	$(top_builddir)/extra/comp_err \

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

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

	--header_file=$(top_builddir)/include/mysqld_error.h \

	--name_file=$(top_builddir)/include/mysqld_ername.h \

	--state_file=$(top_builddir)/include/sql_state.h \

	--in_file=$(top_srcdir)/sql/share/errmsg.txt

$(top_builddir)/include/mysqld_ername.h: $(top_builddir)/include/mysqld_error.h

$(top_builddir)/include/sql_state.h: $(top_builddir)/include/mysqld_error.h



bin_PROGRAMS =		replace comp_err perror resolveip my_print_defaults \

			resolve_stack_dump mysql_waitpid