3 commits

Author	SHA1	Message	Date
unknown	b70b75567a	Merge perch.ndb.mysql.com:/home/jonas/src/50-work ... into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new mysql-test/lib/mtr_timer.pl: Auto merged scripts/make_binary_distribution.sh: Auto merged sql/ha_innodb.cc: Auto merged storage/ndb/include/kernel/signaldata/DumpStateOrd.hpp: Auto merged storage/ndb/include/kernel/signaldata/StartPerm.hpp: Auto merged storage/ndb/include/kernel/signaldata/TcContinueB.hpp: Auto merged storage/ndb/include/mgmapi/ndbd_exit_codes.h: Auto merged storage/ndb/src/kernel/blocks/ERROR_codes.txt: Auto merged storage/ndb/src/kernel/blocks/backup/Backup.cpp: Auto merged storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp: Auto merged storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp: Auto merged storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp: Auto merged storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp: Auto merged storage/ndb/src/kernel/error/ndbd_exit_codes.c: Auto merged storage/ndb/src/kernel/vm/TransporterCallback.cpp: Auto merged storage/ndb/src/ndbapi/NdbTransaction.cpp: Auto merged storage/ndb/src/ndbapi/Ndbif.cpp: Auto merged storage/ndb/src/ndbapi/TransporterFacade.cpp: Auto merged storage/ndb/test/include/NdbRestarter.hpp: Auto merged storage/ndb/test/ndbapi/testNodeRestart.cpp: Auto merged storage/ndb/test/ndbapi/testSystemRestart.cpp: Auto merged storage/ndb/test/ndbapi/testTimeout.cpp: Auto merged storage/ndb/test/run-test/conf-daily-devel-ndbmaster.txt: Auto merged storage/ndb/test/run-test/conf-dl145a.txt: Auto merged storage/ndb/test/run-test/conf-ndbmaster.txt: Auto merged storage/ndb/test/run-test/ndb-autotest.sh: Auto merged storage/ndb/test/src/NdbRestarter.cpp: Auto merged storage/ndb/test/run-test/conf-shark.txt: Auto merged storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp: merge storage/ndb/src/ndbapi/TransporterFacade.hpp: merge storage/ndb/test/run-test/Makefile.am: merge storage/ndb/test/run-test/daily-basic-tests.txt: merge storage/ndb/tools/desc.cpp: merge	2006-03-24 07:43:55 +01:00
unknown	641ce5e97e	wl2723 - ndb opt. nr ... mysql-test/t/rpl_multi_engine.test: merge fix libmysqld/sql_tablespace.cc: New BitKeeper file ``libmysqld/sql_tablespace.cc'' mysql-test/r/ndb_basic_disk.result: New BitKeeper file ``mysql-test/r/ndb_basic_disk.result'' mysql-test/t/ndb_basic_disk.test: New BitKeeper file ``mysql-test/t/ndb_basic_disk.test'' sql/sql_tablespace.cc: New BitKeeper file ``sql/sql_tablespace.cc'' storage/ndb/src/kernel/blocks/OptNR.txt: New BitKeeper file ``storage/ndb/src/kernel/blocks/OptNR.txt'' storage/ndb/src/kernel/vm/mem.txt: New BitKeeper file ``storage/ndb/src/kernel/vm/mem.txt'' storage/ndb/src/kernel/vm/ndbd_malloc_impl.cpp: New BitKeeper file ``storage/ndb/src/kernel/vm/ndbd_malloc_impl.cpp'' storage/ndb/src/kernel/vm/ndbd_malloc_impl.hpp: New BitKeeper file ``storage/ndb/src/kernel/vm/ndbd_malloc_impl.hpp'' storage/ndb/tools/ndb_error_reporter: New BitKeeper file ``storage/ndb/tools/ndb_error_reporter''	2006-01-11 11:35:25 +01:00
unknown	46272fd06b	conf-daily-sql-ndbmaster.txt: ... Rename: ndb/test/run-test/conf-daily-sql-ndbmaster.txt -> storage/ndb/test/run-test/conf-daily-sql-ndbmaster.txt conf-daily-devel-ndbmaster.txt: Rename: ndb/test/run-test/conf-daily-devel-ndbmaster.txt -> storage/ndb/test/run-test/conf-daily-devel-ndbmaster.txt conf-daily-basic-shark.txt: Rename: ndb/test/run-test/conf-daily-basic-shark.txt -> storage/ndb/test/run-test/conf-daily-basic-shark.txt conf-daily-basic-ndbmaster.txt: Rename: ndb/test/run-test/conf-daily-basic-ndbmaster.txt -> storage/ndb/test/run-test/conf-daily-basic-ndbmaster.txt conf-daily-basic-dl145a.txt: Rename: ndb/test/run-test/conf-daily-basic-dl145a.txt -> storage/ndb/test/run-test/conf-daily-basic-dl145a.txt storage/ndb/test/run-test/conf-daily-basic-dl145a.txt: Rename: ndb/test/run-test/conf-daily-basic-dl145a.txt -> storage/ndb/test/run-test/conf-daily-basic-dl145a.txt storage/ndb/test/run-test/conf-daily-basic-ndbmaster.txt: Rename: ndb/test/run-test/conf-daily-basic-ndbmaster.txt -> storage/ndb/test/run-test/conf-daily-basic-ndbmaster.txt storage/ndb/test/run-test/conf-daily-basic-shark.txt: Rename: ndb/test/run-test/conf-daily-basic-shark.txt -> storage/ndb/test/run-test/conf-daily-basic-shark.txt storage/ndb/test/run-test/conf-daily-devel-ndbmaster.txt: Rename: ndb/test/run-test/conf-daily-devel-ndbmaster.txt -> storage/ndb/test/run-test/conf-daily-devel-ndbmaster.txt storage/ndb/test/run-test/conf-daily-sql-ndbmaster.txt: Rename: ndb/test/run-test/conf-daily-sql-ndbmaster.txt -> storage/ndb/test/run-test/conf-daily-sql-ndbmaster.txt	2005-05-13 10:55:12 +02:00

Renamed from ndb/test/run-test/conf-daily-devel-ndbmaster.txt (Browse further)