diff options
| author | Alexander Nozdrin <alik@sun.com> | 2010-03-01 12:39:44 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2010-03-01 12:39:44 +0300 |
| commit | 5867d275a39f4253e7401a034c50d3d169879853 (patch) | |
| tree | c9c3978afa21ee1f05cc50ff5b86a8ab31ec80ee /storage/ndb | |
| parent | 1db438506fad262d0a4a535c919a6ce8d78b28d3 (diff) | |
| parent | 84766b060a09ae3709fcd17cadc16c982c0d3a78 (diff) | |
| download | mariadb-git-5867d275a39f4253e7401a034c50d3d169879853.tar.gz | |
Manual merge from mysql-trunk-merge.
Conflicts:
- sql/share/Makefile.am
Diffstat (limited to 'storage/ndb')
| -rw-r--r-- | storage/ndb/src/common/util/Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/ndb/src/common/util/Makefile.am b/storage/ndb/src/common/util/Makefile.am index 5379a425c49..5cf02fed12f 100644 --- a/storage/ndb/src/common/util/Makefile.am +++ b/storage/ndb/src/common/util/Makefile.am @@ -37,7 +37,7 @@ testBitmask_LDFLAGS = @ndb_bin_am_ldflags@ \ testBitmask.cpp : Bitmask.cpp rm -f testBitmask.cpp - @LN_CP_F@ Bitmask.cpp testBitmask.cpp + @LN_CP_F@ $(srcdir)/Bitmask.cpp testBitmask.cpp testBitmask.o: $(testBitmask_SOURCES) $(CXXCOMPILE) -c $(INCLUDES) -D__TEST_BITMASK__ $< |