into mysql.com:/home/jonas/src/wl2126
ndb/include/ndbapi/NdbDictionary.hpp:
Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Auto merged
ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
Auto merged
ndb/include/util/Bitmask.hpp:
New methods for working with bit fields of
arbitrary size
ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
Use BitmaskImpl at all time (in BitField operations)
BitKeeper/etc/ignore:
auto-union
BitKeeper/etc/logging_ok:
auto-union
BUILD/SETUP.sh:
Auto merged
Build-tools/Do-compile:
Auto merged
client/mysqladmin.cc:
Auto merged
configure.in:
Auto merged
innobase/include/lock0lock.h:
Auto merged
innobase/os/os0file.c:
Auto merged
libmysqld/Makefile.am:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/r/ctype_ucs.result:
Auto merged
mysql-test/r/heap.result:
Auto merged
mysql-test/r/insert_select.result:
Auto merged
mysql-test/r/lowercase_table3.result:
Auto merged
mysql-test/r/rpl_start_stop_slave.result:
Auto merged
mysql-test/r/subselect.result:
Auto merged
mysql-test/t/ctype_ucs.test:
Auto merged
mysql-test/t/rpl_until.test:
Auto merged
mysql-test/t/subselect.test:
Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Auto merged
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/ha_myisam.h:
Auto merged
sql/handler.cc:
Auto merged
sql/handler.h:
Auto merged
sql/item.h:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/lock.cc:
Auto merged
sql/log_event.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/slave.h:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_db.cc:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_rename.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_update.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/log_event.cc:
Merge with 4.1
Trivial cleanup
into mysql.com:/home/jonas/src/wl2126
ndb/include/ndbapi/NdbScanOperation.hpp:
Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Auto merged
ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
Auto merged
ndb/src/ndbapi/NdbScanOperation.cpp:
Auto merged
ndb/test/ndbapi/testScanPerf.cpp:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
ndb/include/kernel/AttributeHeader.hpp:
Added range_no pseudo column
ndb/include/ndbapi/NdbDictionary.hpp:
Added range_no pseudo column
ndb/include/ndbapi/NdbIndexScanOperation.hpp:
Add support for reading range_no
ndb/include/ndbapi/NdbReceiver.hpp:
Add support for reading range_no
ndb/include/ndbapi/NdbScanOperation.hpp:
Add support for reading range_no
ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
Added range_no pseudo column
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Added range_no pseudo column
ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
Added range_no pseudo column
ndb/src/ndbapi/NdbDictionary.cpp:
Added range_no pseudo column
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Added range_no pseudo column
ndb/src/ndbapi/NdbReceiver.cpp:
Add support for reading range_no
ndb/src/ndbapi/NdbScanOperation.cpp:
Read range no
sql/ha_ndbcluster.cc:
Set correct found_p using new feature read_range_no
sql/ha_ndbcluster.h:
Set correct found_p using new feature read_range_no
ndb/include/kernel/signaldata/DictTabInfo.hpp:
Add bit type
ArraySize is used to specify no of bits
ndb/include/ndbapi/NdbDictionary.hpp:
Add bit type
ndb/include/util/NdbSqlUtil.hpp:
Add bit type
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Add bit type
ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
Add bit type
ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
Add bit type
ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
Add bit type
mysql-test/r/ndb_read_multi_range.result:
Add tests of null handling to read_multi
mysql-test/t/ndb_read_multi_range.test:
Add tests of null handling to read_multi
ndb/include/ndbapi/NdbOperation.hpp:
Get recattr
ndb/include/ndbapi/NdbRecAttr.hpp:
Get recattr
sql/ha_ndbcluster.cc:
Fix handling of null values wrt read multi range
sql/ha_ndbcluster.h:
Fix handling of null values wrt read multi range
replace with charsets
check update of primary key wo/ normalizing
ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
Make sure tXfrmFlag is false when checking for update of primary key
client/mysqldump.c:
Auto merged
innobase/include/row0mysql.h:
Auto merged
innobase/lock/lock0lock.c:
Auto merged
innobase/row/row0mysql.c:
Auto merged
innobase/row/row0sel.c:
Auto merged
mysql-test/r/mysqldump.result:
Auto merged
mysql-test/r/ndb_index_unique.result:
Auto merged
mysql-test/r/rpl_start_stop_slave.result:
Auto merged
mysql-test/t/mysqldump.test:
Auto merged
mysql-test/t/ndb_grant.later:
Auto merged
mysql-test/t/ndb_index_unique.test:
Auto merged
ndb/include/ndbapi/NdbScanOperation.hpp:
Auto merged
ndb/src/ndbapi/NdbScanOperation.cpp:
Auto merged
ndb/test/ndbapi/testScanPerf.cpp:
Auto merged
netware/comp_err.def:
Auto merged
netware/isamchk.def:
Auto merged
netware/isamlog.def:
Auto merged
netware/libmysql.def:
Auto merged
netware/my_print_defaults.def:
Auto merged
netware/myisam_ftdump.def:
Auto merged
netware/myisamchk.def:
Auto merged
netware/myisamlog.def:
Auto merged
netware/myisampack.def:
Auto merged
netware/mysql.def:
Auto merged
netware/mysql_install.def:
Auto merged
netware/mysql_install_db.def:
Auto merged
netware/mysql_test_run.def:
Auto merged
netware/mysql_waitpid.def:
Auto merged
netware/mysqladmin.def:
Auto merged
netware/mysqlbinlog.def:
Auto merged
netware/mysqlcheck.def:
Auto merged
netware/mysqld.def:
Auto merged
netware/mysqld_safe.def:
Auto merged
netware/mysqldump.def:
Auto merged
netware/mysqlimport.def:
Auto merged
netware/mysqlshow.def:
Auto merged
netware/mysqltest.def:
Auto merged
netware/pack_isam.def:
Auto merged
netware/perror.def:
Auto merged
netware/replace.def:
Auto merged
netware/resolve_stack_dump.def:
Auto merged
netware/resolveip.def:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
client/mysqladmin.cc:
Merge for Netware changes. Indention fixes.
sql/field.cc:
Merge fixes, warnings added from 4.1 to 5.0
sql/mysqld.cc:
Merge fixes, just indention fixes.
added extra calls to retrieve connectstring used
reengineered connect somewhat to make retries etc explicit
mysql-test/r/ndb_index_unique.result:
fixed error in test result
ndb/include/mgmapi/mgmapi.h:
added extra calls to retrieve connectstring used
ndb/include/mgmcommon/ConfigRetriever.hpp:
added extra calls to retrieve connectstring used
ndb/include/ndbapi/ndb_cluster_connection.hpp:
added extra calls to retrieve connectstring used
reengineered connect somewhat to make retries etc explicit
ndb/src/common/mgmcommon/ConfigRetriever.cpp:
added extra calls to retrieve connectstring used
ndb/src/mgmapi/mgmapi.cpp:
added extra calls to retrieve connectstring used
ndb/src/mgmclient/CommandInterpreter.cpp:
moved parse of quit to avoid connect before
ndb/src/ndbapi/Ndbinit.cpp:
reengineered connect somewhat to make retries etc explicit
ndb/src/ndbapi/ndb_cluster_connection.cpp:
added extra calls to retrieve connectstring used
reengineered connect somewhat to make retries etc explicit
ndb/tools/listTables.cpp:
reengineered connect somewhat to make retries etc explicit
sql/ha_ndbcluster.cc:
added extra calls to retrieve connectstring used
reengineered connect somewhat to make retries etc explicit
added new error type "configuration or application error"
Added check if backup is issued during diskless mode, backup refuse returned
added possibility to get error code as a result from management client
addded possibility to set connecstring with CONNECT command
changed to use strcasecmp instead of strcmp
added possibility to run one command on cammand client to ndb_mgm and get an errorcode of command fails
made thread safe veriosn of getErrorText in management server
aligned backup errorcodes with rest of ndb error codes giving it range from 1300
print error message from regular ndberror struct
added new arrer type "cofiguration or application error"
commented on allocaded ranges for errors
ndb/include/kernel/signaldata/BackupImpl.hpp:
aligned backup errorcodes with rest of ndb error codes giving it range from 1300
ndb/include/kernel/signaldata/BackupSignalData.hpp:
aligned backup errorcodes with rest of ndb error codes giving it range from 1300
ndb/include/ndbapi/ndberror.h:
added new error type "configuration or application error"
ndb/src/kernel/blocks/backup/Backup.cpp:
Added check if backup is issued during diskless mode, backup refuse returned
ndb/src/kernel/blocks/backup/Backup.hpp:
member variable in backup block to indicate diskless or not
ndb/src/kernel/blocks/backup/BackupInit.cpp:
Added check if backup is issued during diskless mode, backup refuse returned
ndb/src/mgmclient/CommandInterpreter.cpp:
added possibility to get error code as a result from management client
addded possibility to set connecstring with CONNECT command
changed to use strcasecmp instead of strcmp
ndb/src/mgmclient/main.cpp:
added possibility to run one command on cammand client to ndb_mgm and get an errorcode of command fails
ndb/src/mgmclient/ndb_mgmclient.hpp:
added possibility to get error code as a result from management client
ndb/src/mgmsrv/CommandInterpreter.cpp:
made thread safe veriosn of getErrorText in management server
ndb/src/mgmsrv/CommandInterpreter.hpp:
made thread safe veriosn of getErrorText in management server
ndb/src/mgmsrv/MgmtSrvr.cpp:
aligned backup errorcodes with rest of ndb error codes giving it range from 1300
print error message from regular ndberror struct
ndb/src/mgmsrv/MgmtSrvr.hpp:
made thread safe veriosn of getErrorText in management server
ndb/src/mgmsrv/Services.cpp:
made thread safe veriosn of getErrorText in management server
ndb/src/mgmsrv/Services.hpp:
made thread safe veriosn of getErrorText in management server
ndb/src/ndbapi/ndberror.c:
added new arrer type "cofiguration or application error"
commented on allocaded ranges for errors
aligned backup errors with rest of errors
ndb/include/ndbapi/NdbScanOperation.hpp:
Improved doc. a bit
ndb/src/ndbapi/NdbConnectionScan.cpp:
Set error code
ndb/src/ndbapi/NdbScanOperation.cpp:
Check error directly after taking mutex
ndb/test/ndbapi/testScan.cpp:
new scan test with lots of threads
ndb/test/run-test/daily-basic-tests.txt:
Added two more scan tests
Collapsed testTransactions & testOperations
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
BitKeeper/etc/logging_ok:
auto-union
innobase/buf/buf0buf.c:
Auto merged
innobase/buf/buf0lru.c:
Auto merged
innobase/row/row0mysql.c:
Auto merged
innobase/row/row0sel.c:
Auto merged
ndb/src/mgmsrv/main.cpp:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/repl_failsafe.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/slave.h:
Auto merged
sql/sql_repl.cc:
Auto merged
between 80% and 360% performance improvement measured
ndb/docs/wl2077.txt:
Update figures after batching of range scans and pekka's blob fixes
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Don't close scan if other ranges exists
added command CONNECT in management client
added some verbose printouts
removed prompt printout on !isatty(0)
ndb/src/mgmapi/mgmapi.cpp:
improved verbose printouts on connecting to management server
ndb/src/mgmclient/CommandInterpreter.cpp:
cleaned up code a bit
added command CONNECT in management client
added some verbose printouts
ndb/src/mgmclient/main.cpp:
removed prompt printout on !isatty(0)
ndb/src/mgmclient/ndb_mgmclient.hpp:
added verbose opotion
only try to connect to other ndb_mgmd if connect_string explicitly given or config_file not given
ndb/src/mgmsrv/main.cpp:
moved default setting to config.ini to MgmtSrvr
