diff options
author | unknown <lzhou/root@dev3-138.dev.cn.tlan> | 2006-09-19 18:04:47 +0000 |
---|---|---|
committer | unknown <lzhou/root@dev3-138.dev.cn.tlan> | 2006-09-19 18:04:47 +0000 |
commit | a51a8c1e655e2b6997fb6f1603ea6f063eb20e0b (patch) | |
tree | 38e02c07ba6e6e23f1633ee6a1b4df36a389ab56 /storage/ndb/src/ndbapi/NdbScanOperation.cpp | |
parent | cc8b2bd21870f5957238f86f6543783cec2e5f21 (diff) | |
parent | 934b9a4ecc659333b3ee906a694f219e1f61914d (diff) | |
download | mariadb-git-a51a8c1e655e2b6997fb6f1603ea6f063eb20e0b.tar.gz |
Merge lzhou@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb-bj
into dev3-138.dev.cn.tlan:/home/zhl/mysql/mysql-5.0/bug21799
ndb/src/mgmclient/CommandInterpreter.cpp:
Auto merged
ndb/src/ndbapi/ndberror.c:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_view.cc:
Auto merged
Diffstat (limited to 'storage/ndb/src/ndbapi/NdbScanOperation.cpp')
0 files changed, 0 insertions, 0 deletions