diff options
author | unknown <tomas@poseidon.ndb.mysql.com> | 2005-07-15 13:32:08 +0200 |
---|---|---|
committer | unknown <tomas@poseidon.ndb.mysql.com> | 2005-07-15 13:32:08 +0200 |
commit | 2a48132e01d6a52559cd6e9ad9145c9484e00c24 (patch) | |
tree | 736d4535d2036fee89cdc4c8c299157c9b899828 /ndb/Makefile.am | |
parent | 638fe9ec3fd6a2f3086c1696dc97d5975894a31e (diff) | |
parent | 130cd50dcb39485744fe50795a22db5f032ce6c6 (diff) | |
download | mariadb-git-2a48132e01d6a52559cd6e9ad9145c9484e00c24.tar.gz |
Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-release
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-new
mysql-test/t/ctype_utf8.test:
Auto merged
ndb/src/common/mgmcommon/ConfigRetriever.cpp:
Auto merged
ndb/src/common/transporter/TransporterRegistry.cpp:
Auto merged
ndb/src/mgmclient/CommandInterpreter.cpp:
Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
Auto merged
ndb/src/mgmsrv/MgmtSrvr.hpp:
Auto merged
ndb/src/mgmsrv/Services.cpp:
Auto merged
sql/sql_prepare.cc:
Auto merged
Diffstat (limited to 'ndb/Makefile.am')
0 files changed, 0 insertions, 0 deletions