diff options
| author | unknown <tomas@poseidon.ndb.mysql.com> | 2006-05-16 10:37:40 +0200 |
|---|---|---|
| committer | unknown <tomas@poseidon.ndb.mysql.com> | 2006-05-16 10:37:40 +0200 |
| commit | 37b79d90d3b46122ef42f1fec342e895664ec71c (patch) | |
| tree | 83f5d73ce1228e4e6dc0f0f5c079508f5a2757e2 /client/client_priv.h.rej | |
| parent | 17c9545617dd8b8fde47f1ad6b95c09fe2149dd7 (diff) | |
| parent | 326ebe4c5bc162a42adff43c138af144a02cdcb0 (diff) | |
| download | mariadb-git-37b79d90d3b46122ef42f1fec342e895664ec71c.tar.gz | |
Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
client/mysql.cc:
Auto merged
mysql-test/r/func_str.result:
Auto merged
mysql-test/r/rpl_temporary.result:
Auto merged
mysql-test/r/select.result:
Auto merged
mysql-test/t/rpl_temporary.test:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/sql_show.cc:
Auto merged
storage/ndb/src/ndbapi/ClusterMgr.cpp:
Auto merged
storage/ndb/src/ndbapi/ClusterMgr.hpp:
Auto merged
storage/ndb/src/ndbapi/DictCache.hpp:
Auto merged
storage/ndb/src/ndbapi/TransporterFacade.hpp:
Auto merged
storage/ndb/src/ndbapi/ndb_cluster_connection.cpp:
Auto merged
storage/ndb/src/ndbapi/ndb_cluster_connection_impl.hpp:
Auto merged
mysql-test/r/information_schema.result:
manual merge
mysql-test/t/information_schema.test:
manual merge
sql/ha_ndbcluster.cc:
manual merge
storage/ndb/include/ndbapi/ndb_cluster_connection.hpp:
manual merge
storage/ndb/src/ndbapi/DictCache.cpp:
manual merge
Diffstat (limited to 'client/client_priv.h.rej')
0 files changed, 0 insertions, 0 deletions