diff options
| author | unknown <pekka@orca.ndb.mysql.com> | 2007-02-12 21:13:19 +0100 |
|---|---|---|
| committer | unknown <pekka@orca.ndb.mysql.com> | 2007-02-12 21:13:19 +0100 |
| commit | ad7c737ec42a1920fd6920c55ba76ad1c6e408fb (patch) | |
| tree | d211fcd675c789e60cc2efa0ce1a6b9d1e11b373 | |
| parent | a4727936d5423ad1becf3b6a83e2bc760565f9b7 (diff) | |
| parent | 1daa0e443566bb394ed4466874d0496db76b1a94 (diff) | |
| download | mariadb-git-ad7c737ec42a1920fd6920c55ba76ad1c6e408fb.tar.gz | |
Merge clam.ndb.mysql.com:/export/home/space/pekka/ndb/version/my50-merge
into clam.ndb.mysql.com:/export/home/space/pekka/ndb/version/my51-merge
sql/ha_ndbcluster.cc:
Auto merged
sql/ha_ndbcluster.h:
Auto merged
storage/ndb/include/ndbapi/NdbIndexScanOperation.hpp:
Auto merged
storage/ndb/include/ndbapi/NdbScanOperation.hpp:
Auto merged
storage/ndb/src/mgmclient/CommandInterpreter.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
Auto merged
storage/ndb/src/ndbapi/Ndb.cpp:
dont see anything here, use local
0 files changed, 0 insertions, 0 deletions