diff options
| author | unknown <tomas@poseidon.ndb.mysql.com> | 2005-05-02 13:19:50 +0200 |
|---|---|---|
| committer | unknown <tomas@poseidon.ndb.mysql.com> | 2005-05-02 13:19:50 +0200 |
| commit | 463c82e24bb8dc9df7cee357246fdc0d09e3e3af (patch) | |
| tree | 39261e4a05bc7527d0aba97b3ca4ddb039112bd6 /tests/pmail.pl | |
| parent | 4aefc3572bda7cc4453dba1d74165e156c4ff6b6 (diff) | |
| parent | 5326bdc616ca307942f646e8e28cfa838555377d (diff) | |
| download | mariadb-git-463c82e24bb8dc9df7cee357246fdc0d09e3e3af.tar.gz | |
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-clean
BitKeeper/etc/logging_ok:
auto-union
mysql-test/mysql-test-run.sh:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/ha_ndbcluster.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
storage/ndb/include/debugger/SignalLoggerManager.hpp:
Auto merged
storage/ndb/include/kernel/ndb_limits.h:
Auto merged
storage/ndb/include/kernel/signaldata/AccScan.hpp:
Auto merged
storage/ndb/include/kernel/signaldata/NextScan.hpp:
Auto merged
storage/ndb/include/kernel/signaldata/ScanFrag.hpp:
Auto merged
storage/ndb/include/kernel/signaldata/ScanTab.hpp:
Auto merged
storage/ndb/include/kernel/signaldata/TcCommit.hpp:
Auto merged
storage/ndb/include/ndbapi/NdbIndexScanOperation.hpp:
Auto merged
storage/ndb/include/ndbapi/NdbScanOperation.hpp:
Auto merged
storage/ndb/include/ndbapi/NdbTransaction.hpp:
Auto merged
storage/ndb/src/common/debugger/SignalLoggerManager.cpp:
Auto merged
storage/ndb/src/common/debugger/signaldata/ScanTab.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbacc/DbaccInit.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
Auto merged
storage/ndb/src/kernel/blocks/dbdict/SchemaFile.hpp:
Auto merged
storage/ndb/src/kernel/blocks/dbdict/printSchemaFile.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtup/Makefile.am:
Auto merged
storage/ndb/src/kernel/vm/Makefile.am:
Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbTransaction.cpp:
Auto merged
storage/ndb/test/include/HugoTransactions.hpp:
Auto merged
storage/ndb/test/ndbapi/testDict.cpp:
Auto merged
storage/ndb/test/ndbapi/testNodeRestart.cpp:
Auto merged
storage/ndb/test/ndbapi/testOIBasic.cpp:
Auto merged
storage/ndb/test/ndbapi/testScan.cpp:
Auto merged
storage/ndb/test/ndbapi/testScanPerf.cpp:
Auto merged
storage/ndb/test/run-test/daily-devel-tests.txt:
Auto merged
storage/ndb/test/src/HugoOperations.cpp:
Auto merged
storage/ndb/test/src/HugoTransactions.cpp:
Auto merged
Diffstat (limited to 'tests/pmail.pl')
0 files changed, 0 insertions, 0 deletions