diff options
| author | unknown <tomas@poseidon.ndb.mysql.com> | 2004-10-06 13:34:17 +0000 |
|---|---|---|
| committer | unknown <tomas@poseidon.ndb.mysql.com> | 2004-10-06 13:34:17 +0000 |
| commit | 4a618a35c54dd0d11bba7d642ea59e8e3684c318 (patch) | |
| tree | 120a08ed6dae287cd6d7dc75089e67f87bbf2032 /sql/ha_ndbcluster.h | |
| parent | f77811a2526818afd09deb3bc363b45702eebe54 (diff) | |
| parent | e82d3d49342f4be222252f22b7f8cb7399baec6f (diff) | |
| download | mariadb-git-4a618a35c54dd0d11bba7d642ea59e8e3684c318.tar.gz | |
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb2
BitKeeper/deleted/.del-ndb_subquery.result:
Delete: mysql-test/r/ndb_subquery.result
BitKeeper/deleted/.del-ndb_subquery.test:
Delete: mysql-test/t/ndb_subquery.test
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
ndb/test/run-test/atrt-mysql-test-run:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
Diffstat (limited to 'sql/ha_ndbcluster.h')
0 files changed, 0 insertions, 0 deletions