diff options
author | unknown <stewart@willster.(none)> | 2006-06-28 22:16:04 +1000 |
---|---|---|
committer | unknown <stewart@willster.(none)> | 2006-06-28 22:16:04 +1000 |
commit | 842ae81df080d09fc6a0fd17f2291e868521eb34 (patch) | |
tree | 49ae743c683a713654c5acb0178c552280931ccc /sql/ha_ndbcluster.h | |
parent | 42f612626f7825a3eac4d3dadd841c1fa344fb81 (diff) | |
parent | 7273e37d04a765f2f0fe341897eeef14321356c3 (diff) | |
download | mariadb-git-842ae81df080d09fc6a0fd17f2291e868521eb34.tar.gz |
Merge mysql.com:/home/stewart/Documents/MySQL/5.1/ndb
into mysql.com:/home/stewart/Documents/MySQL/5.1/merge
sql/ha_ndbcluster.cc:
Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
Auto merged
Diffstat (limited to 'sql/ha_ndbcluster.h')
0 files changed, 0 insertions, 0 deletions