diff options
| author | unknown <tomas@poseidon.mysql.com> | 2007-01-23 07:25:24 +0700 |
|---|---|---|
| committer | unknown <tomas@poseidon.mysql.com> | 2007-01-23 07:25:24 +0700 |
| commit | 8f9198ca0b40c99b3764e170481648330b18efc3 (patch) | |
| tree | d22cff26dafda21120d0d3d1e6b71149f9de2fc6 /mysql-test/r/query_cache.result | |
| parent | 0add38d8bdc0bbc1154f152ebc6fe87c11b3d913 (diff) | |
| parent | 188899cdfc07d58a534c2bdbf09b986ac94adb4e (diff) | |
| download | mariadb-git-8f9198ca0b40c99b3764e170481648330b18efc3.tar.gz | |
Merge poseidon.mysql.com:/home/tomas/mysql-5.0-ndb
into poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
sql/ha_ndbcluster.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_class.cc:
Auto merged
storage/ndb/include/kernel/signaldata/DumpStateOrd.hpp:
Auto merged
storage/ndb/include/portlib/NdbMem.h:
Auto merged
storage/ndb/src/common/debugger/EventLogger.cpp:
Auto merged
storage/ndb/src/common/portlib/NdbMem.c:
Auto merged
storage/ndb/src/common/util/ConfigValues.cpp:
Auto merged
storage/ndb/src/common/util/File.cpp:
Auto merged
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
Auto merged
storage/ndb/src/kernel/blocks/qmgr/Qmgr.hpp:
Auto merged
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
Auto merged
storage/ndb/src/kernel/vm/Configuration.cpp:
Auto merged
storage/ndb/src/kernel/vm/Configuration.hpp:
Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
Auto merged
storage/ndb/test/ndbapi/testNodeRestart.cpp:
Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
Auto merged
mysql-test/r/ndb_basic.result:
manual merge
mysql-test/t/ndb_basic.test:
manual merge
storage/ndb/src/ndbapi/ndberror.c:
manual merge
Diffstat (limited to 'mysql-test/r/query_cache.result')
0 files changed, 0 insertions, 0 deletions