diff options
| author | unknown <joerg@debian.(none)> | 2007-06-01 12:59:06 +0200 |
|---|---|---|
| committer | unknown <joerg@debian.(none)> | 2007-06-01 12:59:06 +0200 |
| commit | 62adac5845e10d83efed634cbe98881561cffa46 (patch) | |
| tree | 7adaf5bb5a13afeea9ec41f2b590b5271e32e42a /plugin | |
| parent | c6ff8a6500f6e3e08d01fcf0687f6987e5adefa6 (diff) | |
| parent | 09f500e84d3608aa24f0281bab1b607664bca902 (diff) | |
| download | mariadb-git-62adac5845e10d83efed634cbe98881561cffa46.tar.gz | |
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1
into debian.(none):/M51/merge-5.1
configure.in:
Auto merged
include/config-win.h:
Auto merged
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'plugin')
| -rw-r--r-- | plugin/daemon_example/Makefile.am | 3 | ||||
| -rw-r--r-- | plugin/fulltext/Makefile.am | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/plugin/daemon_example/Makefile.am b/plugin/daemon_example/Makefile.am index 21a86f8973e..92b1ab040fb 100644 --- a/plugin/daemon_example/Makefile.am +++ b/plugin/daemon_example/Makefile.am @@ -36,3 +36,6 @@ noinst_LIBRARIES = @plugin_daemon_example_static_target@ libdaemon_example_a_CXXFLAGS = $(AM_CFLAGS) libdaemon_example_a_CFLAGS = $(AM_CFLAGS) libdaemon_example_a_SOURCES= daemon_example.cc + +# Don't update the files from bitkeeper +%::SCCS/s.% diff --git a/plugin/fulltext/Makefile.am b/plugin/fulltext/Makefile.am index d4ec097efbd..ec033018a00 100644 --- a/plugin/fulltext/Makefile.am +++ b/plugin/fulltext/Makefile.am @@ -22,3 +22,6 @@ pkglib_LTLIBRARIES= mypluglib.la mypluglib_la_SOURCES= plugin_example.c mypluglib_la_LDFLAGS= -module -rpath $(pkglibdir) mypluglib_la_CFLAGS= -DMYSQL_DYNAMIC_PLUGIN + +# Don't update the files from bitkeeper +%::SCCS/s.% |