diff options
| author | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-02-26 16:06:31 +0300 |
|---|---|---|
| committer | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-02-26 16:06:31 +0300 |
| commit | 84766b060a09ae3709fcd17cadc16c982c0d3a78 (patch) | |
| tree | d57dcac492c1a0c330c28bcf82a1d33db6111e5b /storage/ndb/src | |
| parent | a7dd42b57db41efc174b640f20bf9aff02f88415 (diff) | |
| parent | 03561d35e30807e841c8544a6f5c07d708c6acbd (diff) | |
| download | mariadb-git-84766b060a09ae3709fcd17cadc16c982c0d3a78.tar.gz | |
Manual merge from mysql-5.1-bugteam to mysql-trunk-merge.
Conflicts:
Text conflict in scripts/Makefile.am
Text conflict in sql/share/Makefile.am
Diffstat (limited to 'storage/ndb/src')
| -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__ $< |