diff options
| author | unknown <gni/root@dev3-127.(none)> | 2006-08-29 11:04:51 +0800 |
|---|---|---|
| committer | unknown <gni/root@dev3-127.(none)> | 2006-08-29 11:04:51 +0800 |
| commit | 52ac50b37bb71b3c900bdbcb5b51004f30325f71 (patch) | |
| tree | 48297543cdc84831279258887f9e7e2f98c6500e /libmysql_r | |
| parent | fcee2eb36beb36015312e0964df146c25a9deaeb (diff) | |
| parent | 42f74d76e9a9e146c2d6704d9a8d5205c79577f3 (diff) | |
| download | mariadb-git-52ac50b37bb71b3c900bdbcb5b51004f30325f71.tar.gz | |
Merge gni@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb
into dev3-127.(none):/mnt/mysql/home/ngb/mysql-5.1-ndb-bj
sql/ha_ndbcluster.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_view.cc:
Auto merged
sql/table.cc:
Auto merged
storage/ndb/src/mgmclient/CommandInterpreter.cpp:
Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
Auto merged
storage/ndb/src/ndbapi/ndberror.c:
Auto merged
Diffstat (limited to 'libmysql_r')
0 files changed, 0 insertions, 0 deletions