diff options
author | unknown <tomas@whalegate.ndb.mysql.com> | 2007-03-23 08:20:36 +0100 |
---|---|---|
committer | unknown <tomas@whalegate.ndb.mysql.com> | 2007-03-23 08:20:36 +0100 |
commit | 9fb4f3cda8aa97d883e6927c4a603cbb1793efa0 (patch) | |
tree | 7a38b5185da3d93a1b74b63af9c74229bbedc958 /mysql-test/include/have_crypt.inc | |
parent | 95b334506ce0614718a0bf9826dd274db95749d4 (diff) | |
parent | 0ca0887b24100441a4da8b6e7646e20b2dce098e (diff) | |
download | mariadb-git-9fb4f3cda8aa97d883e6927c4a603cbb1793efa0.tar.gz |
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
sql/ha_ndbcluster.cc:
Auto merged
storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
Diffstat (limited to 'mysql-test/include/have_crypt.inc')
0 files changed, 0 insertions, 0 deletions