Commit cc7e91b0 authored Sep 21, 2006 by unknown

Merge chilla.local:/home/mydev/mysql-5.1--main

into  chilla.local:/home/mydev/mysql-5.1-tomain

parents e0bca512 5ff80c2f

storage/archive/Makefile.am

+1 −1

Original line number	Diff line number	Diff line
		@@ -57,6 +57,6 @@ archive_test_LDADD = $(top_builddir)/mysys/libmysys.a \
		archive_test_LDFLAGS = @NOINST_LDFLAGS@


		EXTRA_DIST = CMakeLists.txt
		EXTRA_DIST = CMakeLists.txt plug.in
		# Don't update the files from bitkeeper
		%::SCCS/s.%

storage/blackhole/Makefile.am

+1 −1

Original line number	Diff line number	Diff line
		@@ -47,6 +47,6 @@ libblackhole_a_CFLAGS = $(AM_CFLAGS)
		libblackhole_a_SOURCES= ha_blackhole.cc


		EXTRA_DIST = CMakeLists.txt
		EXTRA_DIST = CMakeLists.txt plug.in
		# Don't update the files from bitkeeper
		%::SCCS/s.%

storage/csv/Makefile.am

+1 −1

Original line number	Diff line number	Diff line
		@@ -41,6 +41,6 @@ noinst_LIBRARIES = @plugin_csv_static_target@
		libcsv_a_CXXFLAGS = $(AM_CFLAGS)
		libcsv_a_SOURCES = ha_tina.cc

		EXTRA_DIST = CMakeLists.txt
		EXTRA_DIST = CMakeLists.txt plug.in
		# Don't update the files from bitkeeper
		%::SCCS/s.%

storage/example/Makefile.am

+1 −1

Original line number	Diff line number	Diff line
		@@ -47,6 +47,6 @@ libexample_a_CFLAGS = $(AM_CFLAGS)
		libexample_a_SOURCES= ha_example.cc


		EXTRA_DIST = CMakeLists.txt
		EXTRA_DIST = CMakeLists.txt plug.in
		# Don't update the files from bitkeeper
		%::SCCS/s.%

storage/federated/Makefile.am

+1 −1

Original line number	Diff line number	Diff line
		@@ -47,6 +47,6 @@ libfederated_a_CFLAGS = $(AM_CFLAGS)
		libfederated_a_SOURCES= ha_federated.cc


		EXTRA_DIST = CMakeLists.txt
		EXTRA_DIST = CMakeLists.txt plug.in
		# Don't update the files from bitkeeper
		%::SCCS/s.%