diff options
author | Michael Widenius <monty@mysql.com> | 2010-11-30 23:11:03 +0200 |
---|---|---|
committer | Michael Widenius <monty@mysql.com> | 2010-11-30 23:11:03 +0200 |
commit | 1e5061fe3be981d6f685a2865fd1e2bcd3fcc23a (patch) | |
tree | a0c58838a4dd7bdf2ed4d739563da27727ada7b0 /storage/federatedx | |
parent | b2e979d868d5d5964d58c97ed9580e07f6123217 (diff) | |
parent | 6f279f40145624c1ffab06c63521f96ce4ac3a02 (diff) | |
download | mariadb-git-1e5061fe3be981d6f685a2865fd1e2bcd3fcc23a.tar.gz |
merge with 5.1
Diffstat (limited to 'storage/federatedx')
-rw-r--r-- | storage/federatedx/Makefile.am | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/storage/federatedx/Makefile.am b/storage/federatedx/Makefile.am index 637ad642ce6..731b5dee01e 100644 --- a/storage/federatedx/Makefile.am +++ b/storage/federatedx/Makefile.am @@ -69,6 +69,3 @@ ha_federatedx_la_LIBADD = # $(DTRACE) $(DTRACEFLAGS) -G -s federatedx_probes.d $(DTRACEFILES) # End - -# Don't update the files from bitkeeper -%::SCCS/s.% |