summaryrefslogtreecommitdiff
path: root/libmysqld
diff options
context:
space:
mode:
authorunknown <mskold/marty@linux.site>2007-04-24 10:39:21 +0200
committerunknown <mskold/marty@linux.site>2007-04-24 10:39:21 +0200
commit5506f6ca8b50ee2fc5e5cdf654834de5b1197659 (patch)
tree21aeff42379370238fa06cfa8067e89dd3e2025d /libmysqld
parentd381937b1e208f1b5f947f84ece7030a216f71a4 (diff)
parent25b372b3fd7e7800e657b17f5295b332814192ec (diff)
downloadmariadb-git-5506f6ca8b50ee2fc5e5cdf654834de5b1197659.tar.gz
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb sql/Makefile.am: Using local, will merge manually sql/ha_ndbcluster.cc: Using local, will merge manually. sql/ha_ndbcluster.h: Using local, will merge manually.
Diffstat (limited to 'libmysqld')
0 files changed, 0 insertions, 0 deletions