diff options
| author | unknown <mskold@mysql.com> | 2006-06-16 08:47:46 +0200 |
|---|---|---|
| committer | unknown <mskold@mysql.com> | 2006-06-16 08:47:46 +0200 |
| commit | 8128470913e76a508d028fc2f2a2feb0163934a6 (patch) | |
| tree | b5c79e1231ba36599e21abe8562b3dff5e5c4cb1 /extra/yassl/src/socket_wrapper.cpp | |
| parent | 9b402b909b22d97f5809f73eb1e57229cc9ce572 (diff) | |
| parent | 3f19b05bb00366df88d72f9b6507f897f2f9370b (diff) | |
| download | mariadb-git-8128470913e76a508d028fc2f2a2feb0163934a6.tar.gz | |
Merge mysql.com:/home/marty/MySQL/mysql-5.0
into mysql.com:/home/marty/MySQL/mysql-5.1
mysql-test/t/ndb_lock.test:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
storage/ndb/src/mgmsrv/Services.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp:
Auto merged
mysql-test/r/ndb_lock.result:
Merge (using local)
Diffstat (limited to 'extra/yassl/src/socket_wrapper.cpp')
0 files changed, 0 insertions, 0 deletions