ndb/include/ndbapi/NdbScanOperation.hpp:
Auto merged
ndb/src/common/util/version.c:
Auto merged
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
ndb/src/ndbapi/NdbConnection.cpp:
Auto merged
ndb/test/ndbapi/testReadPerf.cpp:
Auto merged
ndb/test/ndbapi/testScanPerf.cpp:
Auto merged
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
mysql-test/r/fulltext.result:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_sum.h:
Auto merged
sql/table.cc:
Auto merged
changed so that error is returned if format is wrong in logger param parsing
ndb/src/common/logger/Logger.cpp
some debuf printout added
ndb/src/mgmsrv/InitConfigFileParser.cpp
rewrote parsing on parseNameValuePair, was buggy
ndb/src/common/logger/LogHandler.cpp:
changed so that error is returned if format is wrong in logger param parsing
ndb/src/common/logger/Logger.cpp:
some debuf printout added
ndb/src/mgmsrv/InitConfigFileParser.cpp:
rewrote parsing on parseNameValuePair, was buggy
into mysql.com:/home/jonas/src/wl2126
ndb/include/ndbapi/NdbConnection.hpp:
Auto merged
ndb/src/ndbapi/NdbConnection.cpp:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/ha_ndbcluster.h:
Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Scan number allocation must be on table even in case of range scan
Otherwise scan takeover won't work as LQHKEYREQ contains table
Build-tools/Do-compile:
Auto merged
client/Makefile.am:
Auto merged
client/mysqladmin.cc:
Auto merged
configure.in:
Auto merged
ndb/src/common/util/version.c:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/ha_ndbcluster.h:
Auto merged
ndb/src/mgmsrv/main.cpp:
Resolved NDB conflict between 4.1 and 5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Auto merged
ndb/src/ndbapi/NdbConnection.cpp:
Auto merged
into mysql.com:/home/jonas/src/mysql-4.1
ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Auto merged
ndb/src/ndbapi/NdbConnection.cpp:
Auto merged
Queue scan on real fragment.
Index fragment for range scans
Table fragment for table scans
ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
Document meaning of fragPtrI and how it differs
from scanTcRec->fragmentptr
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Queue scan on real fragment.
Index fragment for range scans
Table fragment for table scans
ndb/src/ndbapi/NdbConnection.cpp:
Check tOp before assigning
into mysql.com:/home/jonas/src/mysql-5.0-ndb
ndb/include/ndbapi/NdbConnection.hpp:
Auto merged
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
Auto merged
ndb/src/ndbapi/NdbConnection.cpp:
Auto merged
into mysql.com:/home/jonas/src/mysql-5.0-ndb
ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Auto merged
ndb/src/ndbapi/NdbConnection.cpp:
Auto merged
ndb/src/ndbapi/NdbScanOperation.cpp:
Auto merged
ndb/test/ndbapi/testReadPerf.cpp:
Auto merged
ndb/test/ndbapi/testScanPerf.cpp:
Auto merged
BitKeeper/etc/ignore:
auto-union
BitKeeper/etc/logging_ok:
auto-union
Docs/Support/texi2html:
Auto merged
client/mysqltest.c:
Auto merged
innobase/lock/lock0lock.c:
Auto merged
innobase/row/row0sel.c:
Auto merged
mysql-test/r/fulltext.result:
Auto merged
mysql-test/r/heap.result:
Auto merged
mysql-test/r/key.result:
Auto merged
mysql-test/r/myisam.result:
Auto merged
mysql-test/r/rpl000015.result:
Auto merged
mysql-test/r/rpl_log_pos.result:
Auto merged
mysql-test/r/rpl_rotate_logs.result:
Auto merged
mysql-test/r/subselect.result:
Auto merged
mysql-test/r/type_blob.result:
Auto merged
mysql-test/t/key.test:
Auto merged
mysql-test/t/myisam.test:
Auto merged
mysql-test/t/rpl000015.test:
Auto merged
mysql-test/t/rpl_log_pos.test:
Auto merged
mysql-test/t/rpl_rotate_logs.test:
Auto merged
mysql-test/t/subselect.test:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/ha_ndbcluster.h:
Auto merged
sql/handler.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_do.cc:
Auto merged
sql/sql_table.cc:
Auto merged
ndb/include/ndbapi/NdbConnection.hpp:
fix blob performance in long transactions
ndb/src/ndbapi/NdbConnection.cpp:
fix blob performance in long transactions
ndb/test/ndbapi/testBlobs.cpp:
fix blob performance in long transactions
into mysql.com:/home/jonas/src/tmp
ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Auto merged
ndb/src/ndbapi/NdbConnection.cpp:
Auto merged
ndb/src/ndbapi/NdbScanOperation.cpp:
Auto merged
ndb/test/ndbapi/testReadPerf.cpp:
Auto merged
ndb/test/ndbapi/testScanPerf.cpp:
Auto merged
into mysql.com:/home/jonas/src/wl2077
ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Auto merged
ndb/src/ndbapi/NdbConnection.cpp:
Auto merged
ndb/src/ndbapi/NdbScanOperation.cpp:
Auto merged
ndb/test/ndbapi/testReadPerf.cpp:
Auto merged
ndb/test/ndbapi/testScanPerf.cpp:
Auto merged
prepared for using query cache in ndb
ndb/include/ndbapi/NdbIndexScanOperation.hpp:
added force send interface to scan
ndb/include/ndbapi/NdbResultSet.hpp:
added force send interface to scan
ndb/include/ndbapi/NdbScanOperation.hpp:
added force send interface to scan
ndb/src/ndbapi/NdbResultSet.cpp:
added force send interface to scan
ndb/src/ndbapi/NdbScanOperation.cpp:
added force send interface to scan
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-mysqladmin
ndb/src/kernel/vm/Configuration.cpp:
Auto merged
ndb/src/mgmclient/main.cpp:
Auto merged
ndb/src/mgmsrv/main.cpp:
Auto merged
ndb/tools/restore/restore_main.cpp:
Auto merged
ndb/tools/select_all.cpp:
Auto merged
ndb/tools/waiter.cpp:
Auto merged
assigned "localhost" as default connectstring
added a disconnect() first in connect()
removed double implementation of connect code, use connect() in NdbRestarter
removed extra "host=" in connectstring
ndb/include/mgmapi/mgmapi.h:
removed wrong comment
ndb/test/include/NdbRestarter.hpp:
removed unused variables
ndb/test/src/NdbBackup.cpp:
removed double implementation of connect code, use connect() in NdbRestarter
removed extra "host=" in connectstring
ndb/test/src/NdbRestarter.cpp:
removed unused variables
assigned "localhost" as default connectstring
added a disconnect() first in connect()
into mysql.com:/home/jonas/src/wl2077
client/Makefile.am:
Auto merged
client/mysqladmin.cc:
Auto merged
ndb/src/kernel/vm/Configuration.cpp:
Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Auto merged
ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Auto merged
ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
Auto merged
ndb/src/kernel/blocks/dbtux/Dbtux.hpp:
Auto merged
ndb/src/kernel/blocks/dbtux/DbtuxDebug.cpp:
Auto merged
ndb/src/kernel/blocks/dbtux/DbtuxMeta.cpp:
Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Auto merged
into mysql.com:/home/jonas/src/mysql-4.1-fix
ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Auto merged
ndb/src/ndbapi/NdbConnection.cpp:
Auto merged
ndb/src/ndbapi/NdbScanOperation.cpp:
Auto merged
ndb/test/ndbapi/testReadPerf.cpp:
Auto merged
ndb/test/ndbapi/testScanPerf.cpp:
Auto merged
