diff options
| author | unknown <tsmith@siva.hindu.god> | 2007-03-22 11:48:49 -0600 |
|---|---|---|
| committer | unknown <tsmith@siva.hindu.god> | 2007-03-22 11:48:49 -0600 |
| commit | 0b7ba9c2dc192e61b2c9b0f7a32cc8e15255af85 (patch) | |
| tree | 2f53be0b0082a30ca68fe97140250474d7c3771b /BUILD | |
| parent | 7403890a4c1dd2b251e82cc2a0c3dd60b55f362a (diff) | |
| parent | bdb9b4483e270fc9d095109ad47615b6b4be62f3 (diff) | |
| download | mariadb-git-0b7ba9c2dc192e61b2c9b0f7a32cc8e15255af85.tar.gz | |
Merge siva.hindu.god:/home/tsmith/m/bk/maint/50
into siva.hindu.god:/home/tsmith/m/bk/maint/51
storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
storage/ndb/test/ndbapi/testNodeRestart.cpp:
Manual merge (res.waitNodesStartPhase -> NdbSleep_SecSleep)
Diffstat (limited to 'BUILD')
0 files changed, 0 insertions, 0 deletions