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

into serg.mylan:/usr/home/serg/Abk/mysql-5.0

.bzrignore

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

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

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

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

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

include/Makefile.am

@@ -33,15 +33,10 @@ noinst_HEADERS =	config-win.h config-os2.h config-netware.h \
 			mysql_version.h.in my_handler.h my_time.h decimal.h
 
 # mysql_version.h are generated
-SUPERCLEANFILES =	mysql_version.h my_config.h
+CLEANFILES =            mysql_version.h my_config.h readline
 
 # Some include files that may be moved and patched by configure
-DISTCLEANFILES =	sched.h $(SUPERCLEANFILES)
-
-clean:
-	$(RM) -fr readline
-distclean:
-	$(RM) -fr readline
+DISTCLEANFILES =	sched.h $(CLEANFILES)
 
 all-local:		my_config.h
 

libmysql/Makefile.am

@@ -24,7 +24,7 @@ target =	libmysqlclient.la
 target_defs =	-DUNDEF_THREADS_HACK -DDONT_USE_RAID @LIB_EXTRA_CCFLAGS@
 LIBS =		@CLIENT_LIBS@
 INCLUDES =	-I$(top_srcdir)/include $(openssl_includes) @ZLIB_INCLUDES@ \
-		-I$(top_srcdir)/extra
+		-I$(top_builddir)/include
 
 include $(srcdir)/Makefile.shared
 

libmysql_r/Makefile.am

@@ -26,7 +26,7 @@ LIBS = @LIBS@ @ZLIB_LIBS@ @openssl_libs@
 
 INCLUDES = @MT_INCLUDES@ \
 	   -I$(top_srcdir)/include $(openssl_includes) @ZLIB_INCLUDES@ \
-		-I$(top_srcdir)/extra
+		-I$(top_builddir)/include
 ## automake barfs if you don't use $(srcdir) or $(top_srcdir) in include
 include $(top_srcdir)/libmysql/Makefile.shared
 

libmysqld/Makefile.am

@@ -28,7 +28,7 @@ DEFS =			-DEMBEDDED_LIBRARY -DMYSQL_SERVER \
 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)/extra \
+			-I$(top_builddir)/include \
 			$(openssl_includes) @ZLIB_INCLUDES@
 
 noinst_LIBRARIES =	libmysqld_int.a

libmysqld/examples/Makefile.am

-noinst_PROGRAMS =	mysql
-bin_PROGRAMS =	mysqltest_embedded mysql_client_test_embedded
-client_sources =	$(mysqltest_embedded_SOURCES) $(mysql_SOURCES)
-tests_sources= $(mysql_client_test_embedded_SOURCES)
+noinst_PROGRAMS = mysql
+bin_PROGRAMS    = mysqltest_embedded mysql_client_test_embedded
+client_sources  = $(mysqltest_embedded_SOURCES) $(mysql_SOURCES)
+tests_sources   = $(mysql_client_test_embedded_SOURCES)
+CLEANFILES      = $(client_sources) $(tests_sources)
 
 link_sources:
 	for f in $(client_sources); do \
@@ -16,7 +17,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 \
-		-I$(top_srcdir)/extra $(openssl_includes)
+		-I$(top_builddir)/include $(openssl_includes)
 LIBS =		@LIBS@ @WRAPLIBS@ @CLIENT_LIBS@
 LDADD =		@CLIENT_EXTRA_LDFLAGS@ ../libmysqld.a @innodb_system_libs@ @LIBDL@ $(CXXLDFLAGS)
 
@@ -31,9 +32,5 @@ mysql_LDADD = @readline_link@ @TERMCAP_LIB@ $(LDADD)
 mysql_client_test_embedded_LINK = $(CXXLINK)
 mysql_client_test_embedded_SOURCES = mysql_client_test.c
 
-clean:
-	rm -f $(client_sources)
-	rm -f $(tests_sources)
-
 # Don't update the files from bitkeeper
 %::SCCS/s.%

ndb/docs/Makefile.am

@@ -9,7 +9,7 @@ DOXYOUT =	.doxyout
 
 NDB_RELEASE = @NDB_VERSION_MAJOR@.@NDB_VERSION_MINOR@.@NDB_VERSION_BUILD@-@NDB_VERSION_STATUS@
 
-clean:
+clean-local:
 	rm -rf ndbapi.pdf ndbapi.html mgmapi.pdf mgmapi.html
 	rm -rf $(DOXYTMP) $(DOXYOUT)
 

scripts/Makefile.am

@@ -90,7 +90,7 @@ CLEANFILES =		@server_scripts@ \
 			fill_help_tables \
 			mysql_create_system_tables
 
-SUPERCLEANFILES =	mysqlbug
+DISTCLEANFILES =        mysqlbug
 
 # We want the right version and configure comand line in mysqlbug
 mysqlbug: ${top_builddir}/config.status mysqlbug.sh

server-tools/instance-manager/Makefile.am

@@ -14,7 +14,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-INCLUDES= -I$(top_srcdir)/include -I$(top_srcdir)/extra
+INCLUDES= -I$(top_srcdir)/include -I$(top_builddir)/include
 
 DEFS= -DMYSQL_INSTANCE_MANAGER -DMYSQL_SERVER
 

sql/Makefile.am

@@ -22,7 +22,7 @@ MYSQLBASEdir=		$(prefix)
 INCLUDES =		@MT_INCLUDES@ @ZLIB_INCLUDES@ \
 			@bdb_includes@ @innodb_includes@ @ndbcluster_includes@ \
 			-I$(top_srcdir)/include -I$(top_srcdir)/regex \
-			-I$(srcdir) $(openssl_includes) -I$(top_srcdir)/extra
+			-I$(srcdir) $(openssl_includes) -I$(top_builddir)/include
 WRAPLIBS=		@WRAPLIBS@
 SUBDIRS =		share
 libexec_PROGRAMS =	mysqld
@@ -115,6 +115,7 @@ DEFS =			-DMYSQL_SERVER \
 # Don't put lex_hash.h in BUILT_SOURCES as this will give infinite recursion
 BUILT_SOURCES =		sql_yacc.cc sql_yacc.h
 EXTRA_DIST =		udf_example.cc $(BUILT_SOURCES)
+DISTCLEANFILES =        lex_hash.h
 AM_YFLAGS =		-d
 
 mysql_tzinfo_to_sql.cc:
@@ -160,8 +161,5 @@ sql_lex.o:	lex_hash.h
 udf_example.so:	udf_example.cc
 		$(CXXCOMPILE) -shared -o $@ $<
 
-distclean:
-		rm -f lex_hash.h
-
 # Don't update the files from bitkeeper
 %::SCCS/s.%

sql/share/Makefile.am

@@ -14,10 +14,11 @@ dist-hook:
 all:	english/errmsg.sys
 
 # Use the english errmsg.sys as a flag that all errmsg.sys needs to be
-# created. Normally these are created by extra/Makefile.am
+# created. Normally these are created by extra/Makefile
 
 english/errmsg.sys: errmsg.txt
-	$(top_builddir)/extra/comp_err --charset=$(srcdir)/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=errmsg.txt
+	rm $(top_builddir)/include/mysqld_error.h
+	(cd $(top_builddir)/extra && $(MAKE))
 
 install-data-local:
 	for lang in @AVAILABLE_LANGUAGES@; \

tools/Makefile.am

@@ -16,7 +16,7 @@
 # Process this file with automake to create Makefile.in
 
 INCLUDES=@MT_INCLUDES@ -I$(top_srcdir)/include $(openssl_includes) \
-	-I$(top_srcdir)/extra
+	-I$(top_builddir)/include
 LDADD=  @CLIENT_EXTRA_LDFLAGS@ @openssl_libs@ \
 	$(top_builddir)/libmysql_r/libmysqlclient_r.la @ZLIB_LIBS@ 
 bin_PROGRAMS=		mysqlmanager