diff options
| author | unknown <jan@hundin.mysql.fi> | 2005-03-02 07:48:00 +0200 |
|---|---|---|
| committer | unknown <jan@hundin.mysql.fi> | 2005-03-02 07:48:00 +0200 |
| commit | c4409a7cbf9b43ed450340ba9dd6a33f821df5f2 (patch) | |
| tree | e0807a678686cdedb82228cad76296d358321af2 /ndb | |
| parent | ab088b1a15deb1afa5b4c2cd692abab30ed54e59 (diff) | |
| parent | 67457597b80a0f636a8477cffcca37bf64c7c1d0 (diff) | |
| download | mariadb-git-c4409a7cbf9b43ed450340ba9dd6a33f821df5f2.tar.gz | |
Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-5.0
into hundin.mysql.fi:/home/jan/mysql-5.0
sql/ha_innodb.cc:
Auto merged
Diffstat (limited to 'ndb')
| -rw-r--r-- | ndb/test/ndbapi/Makefile.am | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ndb/test/ndbapi/Makefile.am b/ndb/test/ndbapi/Makefile.am index 5eb3c215ee5..9a1726ae11a 100644 --- a/ndb/test/ndbapi/Makefile.am +++ b/ndb/test/ndbapi/Makefile.am @@ -74,8 +74,8 @@ testReadPerf_SOURCES = testReadPerf.cpp testLcp_SOURCES = testLcp.cpp testPartitioning_SOURCES = testPartitioning.cpp testBitfield_SOURCES = testBitfield.cpp -DbCreate_SOURCES= bench/mainPopulate.cpp bench/dbPopulate.cpp bench/userInterface.cpp -DbAsyncGenerator_SOURCES= bench/mainAsyncGenerator.cpp bench/asyncGenerator.cpp bench/ndb_async2.cpp +DbCreate_SOURCES = bench/mainPopulate.cpp bench/dbPopulate.cpp bench/userInterface.cpp bench/dbPopulate.h bench/userInterface.h bench/testData.h bench/testDefinitions.h bench/ndb_schema.hpp bench/ndb_error.hpp +DbAsyncGenerator_SOURCES = bench/mainAsyncGenerator.cpp bench/asyncGenerator.cpp bench/ndb_async2.cpp bench/dbGenerator.h bench/macros.h bench/userInterface.h bench/testData.h bench/testDefinitions.h bench/ndb_schema.hpp bench/ndb_error.hpp INCLUDES_LOC = -I$(top_srcdir)/ndb/include/kernel |