Skip to content

M
mariadb
Commit 0aaf4837 authored by istruewing@chilla.local's avatar istruewing@chilla.local
Browse files
Options

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

into  chilla.local:/home/mydev/mysql-5.1-tomain
parents 77d610c2 9706e6a8
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 10 deletions
storage/archive/Makefile.am
View file @ 0aaf4837
...@@ -57,6 +57,6 @@ archive_test_LDADD = $(top_builddir)/mysys/libmysys.a \ ...@@ -57,6 +57,6 @@ archive_test_LDADD = $(top_builddir)/mysys/libmysys.a \
archive_test_LDFLAGS = @NOINST_LDFLAGS@ archive_test_LDFLAGS = @NOINST_LDFLAGS@
EXTRA_DIST = CMakeLists.txt EXTRA_DIST = CMakeLists.txt plug.in
# Don't update the files from bitkeeper # Don't update the files from bitkeeper
%::SCCS/s.% %::SCCS/s.%
storage/blackhole/Makefile.am
View file @ 0aaf4837
...@@ -47,6 +47,6 @@ libblackhole_a_CFLAGS = $(AM_CFLAGS) ...@@ -47,6 +47,6 @@ libblackhole_a_CFLAGS = $(AM_CFLAGS)
libblackhole_a_SOURCES= ha_blackhole.cc libblackhole_a_SOURCES= ha_blackhole.cc
EXTRA_DIST = CMakeLists.txt EXTRA_DIST = CMakeLists.txt plug.in
# Don't update the files from bitkeeper # Don't update the files from bitkeeper
%::SCCS/s.% %::SCCS/s.%
storage/csv/Makefile.am
View file @ 0aaf4837
...@@ -41,6 +41,6 @@ noinst_LIBRARIES = @plugin_csv_static_target@ ...@@ -41,6 +41,6 @@ noinst_LIBRARIES = @plugin_csv_static_target@
libcsv_a_CXXFLAGS = $(AM_CFLAGS) libcsv_a_CXXFLAGS = $(AM_CFLAGS)
libcsv_a_SOURCES = ha_tina.cc libcsv_a_SOURCES = ha_tina.cc
EXTRA_DIST = CMakeLists.txt EXTRA_DIST = CMakeLists.txt plug.in
# Don't update the files from bitkeeper # Don't update the files from bitkeeper
%::SCCS/s.% %::SCCS/s.%
storage/example/Makefile.am
View file @ 0aaf4837
...@@ -47,6 +47,6 @@ libexample_a_CFLAGS = $(AM_CFLAGS) ...@@ -47,6 +47,6 @@ libexample_a_CFLAGS = $(AM_CFLAGS)
libexample_a_SOURCES= ha_example.cc libexample_a_SOURCES= ha_example.cc
EXTRA_DIST = CMakeLists.txt EXTRA_DIST = CMakeLists.txt plug.in
# Don't update the files from bitkeeper # Don't update the files from bitkeeper
%::SCCS/s.% %::SCCS/s.%
storage/federated/Makefile.am
View file @ 0aaf4837
...@@ -47,6 +47,6 @@ libfederated_a_CFLAGS = $(AM_CFLAGS) ...@@ -47,6 +47,6 @@ libfederated_a_CFLAGS = $(AM_CFLAGS)
libfederated_a_SOURCES= ha_federated.cc libfederated_a_SOURCES= ha_federated.cc
EXTRA_DIST = CMakeLists.txt EXTRA_DIST = CMakeLists.txt plug.in
# Don't update the files from bitkeeper # Don't update the files from bitkeeper
%::SCCS/s.% %::SCCS/s.%
storage/heap/Makefile.am
View file @ 0aaf4837
...@@ -50,7 +50,7 @@ libheap_a_SOURCES = hp_open.c hp_extra.c hp_close.c hp_panic.c hp_info.c \ ...@@ -50,7 +50,7 @@ libheap_a_SOURCES = hp_open.c hp_extra.c hp_close.c hp_panic.c hp_info.c \
hp_hash.c _check.c _rectest.c hp_static.c hp_hash.c _check.c _rectest.c hp_static.c
EXTRA_DIST = CMakeLists.txt EXTRA_DIST = CMakeLists.txt plug.in
# Don't update the files from bitkeeper # Don't update the files from bitkeeper
%::SCCS/s.% %::SCCS/s.%
storage/innobase/Makefile.am
View file @ 0aaf4837
...@@ -91,7 +91,7 @@ EXTRA_DIST = include/btr0btr.h include/btr0btr.ic include/btr0cur.h include/btr ...@@ -91,7 +91,7 @@ EXTRA_DIST = include/btr0btr.h include/btr0btr.ic include/btr0cur.h include/btr
include/ut0sort.h include/ut0ut.h include/ut0ut.ic include/ut0vec.h include/ut0vec.ic include/ha_prototypes.h \ include/ut0sort.h include/ut0ut.h include/ut0ut.ic include/ut0vec.h include/ut0vec.ic include/ha_prototypes.h \
include/ut0list.h include/ut0list.ic \ include/ut0list.h include/ut0list.ic \
include/ut0wqueue.h \ include/ut0wqueue.h \
CMakeLists.txt CMakeLists.txt plug.in
noinst_LIBRARIES = libinnobase.a noinst_LIBRARIES = libinnobase.a
libinnobase_a_LIBADD = usr/libusr.a srv/libsrv.a dict/libdict.a \ libinnobase_a_LIBADD = usr/libusr.a srv/libsrv.a dict/libdict.a \
......
storage/myisam/Makefile.am
View file @ 0aaf4837
...@@ -28,7 +28,7 @@ LDADD = ...@@ -28,7 +28,7 @@ LDADD =
DEFS = @DEFS@ DEFS = @DEFS@
EXTRA_DIST = mi_test_all.sh mi_test_all.res ft_stem.c CMakeLists.txt EXTRA_DIST = mi_test_all.sh mi_test_all.res ft_stem.c CMakeLists.txt plug.in
pkgdata_DATA = mi_test_all mi_test_all.res pkgdata_DATA = mi_test_all mi_test_all.res
pkglib_LIBRARIES = libmyisam.a pkglib_LIBRARIES = libmyisam.a
......
storage/myisammrg/Makefile.am
View file @ 0aaf4837
...@@ -39,7 +39,7 @@ libmyisammrg_a_SOURCES = myrg_open.c myrg_extra.c myrg_info.c myrg_locking.c \ ...@@ -39,7 +39,7 @@ libmyisammrg_a_SOURCES = myrg_open.c myrg_extra.c myrg_info.c myrg_locking.c \
myrg_rnext_same.c myrg_rnext_same.c
EXTRA_DIST = CMakeLists.txt EXTRA_DIST = CMakeLists.txt plug.in
# Don't update the files from bitkeeper # Don't update the files from bitkeeper
%::SCCS/s.% %::SCCS/s.%
storage/ndb/Makefile.am
View file @ 0aaf4837
SUBDIRS = src tools . include @ndb_opt_subdirs@ SUBDIRS = src tools . include @ndb_opt_subdirs@
DIST_SUBDIRS = src tools include test docs DIST_SUBDIRS = src tools include test docs
EXTRA_DIST = config ndbapi-examples EXTRA_DIST = config ndbapi-examples plug.in
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
include $(top_srcdir)/storage/ndb/config/common.mk.am include $(top_srcdir)/storage/ndb/config/common.mk.am
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7