diff options
author | unknown <mskold/marty@linux.site> | 2007-02-07 11:40:43 +0100 |
---|---|---|
committer | unknown <mskold/marty@linux.site> | 2007-02-07 11:40:43 +0100 |
commit | 0690e39b2a25d8378b3924d45e530d8bf037f4af (patch) | |
tree | 9141e9b4aa398ffafea88e40c5b7a4ff2f85926f /BUILD | |
parent | 17f82aa34324923c15914b128c6c79fdba00cf7d (diff) | |
parent | c8f470eaa6e09f674f1d5fe17a7bb5e582431055 (diff) | |
download | mariadb-git-0690e39b2a25d8378b3924d45e530d8bf037f4af.tar.gz |
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1
sql/ha_ndbcluster.cc:
Auto merged
storage/ndb/include/ndbapi/NdbScanOperation.hpp:
Auto merged
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
Auto merged
sql/ha_ndbcluster.h:
SCCS merged
Diffstat (limited to 'BUILD')
0 files changed, 0 insertions, 0 deletions