into mysql.com:/space/pekka/ndb/version/my50-cc
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Auto merged
ndb/src/kernel/blocks/dbacc/Dbacc.hpp:
wl-2066. remove ACC storage. dead code not yet removed
ndb/src/kernel/blocks/dbacc/DbaccInit.cpp:
wl-2066. remove ACC storage. dead code not yet removed
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
wl-2066. remove ACC storage. dead code not yet removed
ndb/src/kernel/blocks/dbacc/Makefile.am:
wl-2066. remove ACC storage. dead code not yet removed
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
wl-2066. remove ACC storage. dead code not yet removed
ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
wl-2066. remove ACC storage. dead code not yet removed
ndb/src/kernel/blocks/dbtup/DbtupIndex.cpp:
wl-2066. remove ACC storage. dead code not yet removed
ndb/include/ndbapi/NdbOperation.hpp:
Auto merged
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Auto merged
ndb/src/ndbapi/NdbConnection.cpp:
Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Auto merged
ndb/src/ndbapi/NdbOperation.cpp:
Auto merged
ndb/src/ndbapi/NdbOperationExec.cpp:
Auto merged
ndb/src/ndbapi/NdbScanOperation.cpp:
Auto merged
ndb/include/ndbapi/NdbIndexOperation.hpp:
merge (again)
ndb/src/ndbapi/NdbBlob.cpp:
merge (again)
ndb/src/ndbapi/NdbIndexOperation.cpp:
merge (again)
BitKeeper/etc/ignore:
auto-union
client/mysqldump.c:
Auto merged
client/mysqltest.c:
Auto merged
innobase/include/row0mysql.h:
Auto merged
libmysql/libmysql.c:
Auto merged
mysql-test/r/ctype_ucs.result:
Auto merged
mysql-test/r/fulltext.result:
Auto merged
mysql-test/r/func_in.result:
Auto merged
mysql-test/r/ps.result:
Auto merged
mysql-test/r/ps_2myisam.result:
Auto merged
mysql-test/r/ps_3innodb.result:
Auto merged
mysql-test/r/ps_4heap.result:
Auto merged
mysql-test/r/ps_5merge.result:
Auto merged
mysql-test/r/ps_6bdb.result:
Auto merged
mysql-test/r/type_float.result:
Auto merged
mysql-test/r/user_var.result:
Auto merged
mysql-test/t/innodb.test:
Auto merged
mysql-test/t/user_var.test:
Auto merged
mysql-test/t/variables.test:
Auto merged
sql/ha_berkeley.cc:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/ha_innodb.h:
Auto merged
sql/ha_ndbcluster.h:
Auto merged
sql/item.cc:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_sum.cc:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/repl_failsafe.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_db.cc:
Auto merged
sql/sql_error.cc:
Auto merged
sql/sql_help.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_select.h:
Auto merged
sql/sql_yacc.yy:
Auto merged
Added create table hook for NDB API test framework
ndb/test/include/NDBT_Tables.hpp:
Added create table hook for NDB API test framework
ndb/test/src/NDBT_Tables.cpp:
Added create table hook for NDB API test framework
changed to use new switch
mysql-test/ndb/ndbcluster.sh:
updated start script for ndbcluster to make better cleanup
ndb/test/run-test/main.cpp:
changed to use new switch
BitKeeper/etc/logging_ok:
auto-union
Docs/Support/texi2html:
Auto merged
include/mysql.h:
Auto merged
include/mysql_com.h:
Auto merged
libmysql/libmysql.c:
Auto merged
myisam/mi_check.c:
Auto merged
myisam/myisamchk.c:
Auto merged
mysql-test/include/ps_modify.inc:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/r/ctype_recoding.result:
Auto merged
mysql-test/r/fulltext.result:
Auto merged
mysql-test/r/gis.result:
Auto merged
mysql-test/r/ndb_blob.result:
Auto merged
mysql-test/r/ps_2myisam.result:
Auto merged
mysql-test/r/ps_3innodb.result:
Auto merged
mysql-test/r/ps_4heap.result:
Auto merged
mysql-test/r/ps_5merge.result:
Auto merged
mysql-test/r/ps_6bdb.result:
Auto merged
mysql-test/r/sql_mode.result:
Auto merged
mysql-test/t/join_outer.test:
Auto merged
mysql-test/t/key.test:
Auto merged
mysql-test/t/range.test:
Auto merged
mysql-test/t/show_check.test:
Auto merged
mysql-test/t/sql_mode.test:
Auto merged
sql/field.cc:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/ha_ndbcluster.h:
Auto merged
sql/item.h:
Auto merged
sql/item_create.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_func.h:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/net_serv.cc:
Auto merged
sql/protocol.cc:
Auto merged
sql/protocol.h:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_handler.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_string.cc:
Auto merged
sql/sql_string.h:
Auto merged
sql/sql_table.cc:
Auto merged
client/mysqltest.c:
Merge with 4.1
mysql-test/r/range.result:
Merge with 4.1
Added missing drop table test
sql/ha_innodb.cc:
Merge with 4.1
sql/item.cc:
Merge with 4.1
sql/item_cmpfunc.cc:
Merge with 4.1
sql/opt_range.cc:
Merge with 4.1
sql/sql_prepare.cc:
Merge with 4.1
tests/client_test.c:
Merge with 4.1
Added code to support --silent
configure.in:
Merge with 4.1
ndb/src/common/util/version.c:
Merge with 4.1
ndb/src/ndbapi/ndberror.c:
826 error text
mysql-test/r/ndb_blob.result:
result displayed error
mysql-test/t/ndb_blob.test:
result displayed error
ndb/src/ndbapi/NdbBlob.cpp:
update head+inline earlier
ndb/src/ndbapi/NdbOperationExec.cpp:
blob IgnoreError bug
ndb/test/ndbapi/testBlobs.cpp:
tried to set non-nullable to null, causing a complex abort case
ndb/src/ndbapi/NdbConnection.cpp:
prepared ops CAN be left in complex abort
there was a clash in using -c, added -f as the future proof switch
mysql-test/ndb/ndbcluster.sh:
changed to use the future-proof option to ndb_mgmd
ndb/src/mgmsrv/main.cpp:
there was a clash in using -c, added -f as the future proof switch
remove compiler warning
patch for my_vsnprintf not dully implemented
patch for platfroms that return -1 on snprintf overflow
compile fix for hpux
configure.in:
add compile flad -DSNPRINTF_RETURN_TRUNC on hp ux 11
ndb/src/common/editline/sysunix.c:
remove compiler warning
ndb/src/common/util/basestring_vsnprintf.c:
patch for my_vsnprintf not dully implemented
patch for platfroms that return -1 on snprintf overflow
ndb/src/kernel/vm/Emulator.hpp:
compile fix for hpux
ndb/src/mgmsrv/Services.cpp:
compile fix for hp ux
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
remove compiler warning
ndb/src/ndbapi/NdbDictionary.cpp:
print if something is distribution key
ndb/src/ndbapi/NdbIndexOperation.cpp:
Init theNoOfTupKeyLeft
ndb/src/ndbapi/NdbScanOperation.cpp:
Charsets
Fix so that signed/unsigned char does not matter in comparision
ndb/src/ndbapi/NdbOperationExec.cpp:
Fix so that signed/unsigned char does not matter in comparision
ndb/include/kernel/signaldata/ScanTab.hpp:
Add distribution key to ScanTab to enable scanning of specific fragment
ndb/include/ndbapi/NdbOperation.hpp:
New methods for controlling distribution/partitioning
ndb/include/ndbapi/NdbScanOperation.hpp:
New methods for controlling distribution/partitioning
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Don't mask away kvalue from hash while computing fragId
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Add distribution key to ScanTab to enable scanning of specific fragment
ndb/src/ndbapi/NdbBlob.cpp:
removed m_sizeOfKeysInWords which was the same a m_keyLenInWords
ndb/src/ndbapi/NdbConnection.cpp:
removed explicit cast
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
removed m_sizeOfKeysInWords which was the same a m_keyLenInWords
ndb/src/ndbapi/NdbDictionaryImpl.hpp:
removed m_sizeOfKeysInWords which was the same a m_keyLenInWords
ndb/src/ndbapi/NdbIndexOperation.cpp:
removed theFirstKEYINFO and replaced that with theTCREQ->next
ndb/src/ndbapi/NdbOperation.cpp:
removed theFirstKEYINFO and replaced that with theTCREQ->next
ndb/src/ndbapi/NdbOperationExec.cpp:
removed theFirstKEYINFO and replaced that with theTCREQ->next
ndb/src/ndbapi/NdbOperationSearch.cpp:
removed theFirstKEYINFO and replaced that with theTCREQ->next
Enable partition scan
ndb/src/ndbapi/NdbScanOperation.cpp:
removed theFirstKEYINFO and replaced that with theTCREQ->next
Enable partition scan
changed define SNPRINTF_RETURN_ZERO to SNPRINTF_RETURN_TRUNC
added define NDB_INIT
removed getarg, strlcat, strlcpy
aligned ndb version with mysql version
cpcd: removed old way of reading config file and replaced with mysql load_defaults
changed from using getarg to my_getopts
use mysql my_progname
moved getarg to test
BitKeeper/deleted/.del-strlcat.c~250851f8f1ac1c2c:
Delete: ndb/src/common/util/strlcat.c
BitKeeper/deleted/.del-strlcpy.c~43266e312d11c47b:
Delete: ndb/src/common/util/strlcpy.c
ndb/test/include/getarg.h:
Rename: ndb/include/util/getarg.h -> ndb/test/include/getarg.h
configure.in:
aligned ndb versioning with mysql
changed define SNPRINTF_RETURN_ZERO to SNPRINTF_RETURN_TRUNC
ndb/include/ndb_global.h:
added define NDB_INIT
removed strlcpy, strlcat
ndb/src/common/editline/sysunix.c:
removed usage of strlcat
ndb/src/common/util/Makefile.am:
removed getarg, strlcat, strlcpy
ndb/src/common/util/basestring_vsnprintf.c:
changed define from SNPRINTF_RETURN_ZERO to SNPRINTF_RETURN_TRUNC
ndb/src/common/util/socket_io.cpp:
removed usage of strlcat
ndb/src/common/util/version.c:
aligned ndb version with mysql version
ndb/src/cw/cpcd/common.cpp:
removed old way of reading config file and replaced with mysql load_defaults
ndb/src/cw/cpcd/common.hpp:
removed old way of reading config file and replaced with mysql load_defaults
ndb/src/cw/cpcd/main.cpp:
changed from usin getarg to my_opts
ndb/src/kernel/blocks/backup/restore/main.cpp:
changed from usin getarg to my_opts
ndb/src/kernel/error/ErrorReporter.cpp:
use mysql my_progname
ndb/src/kernel/main.cpp:
removed const in main declaration
ndb/src/kernel/vm/Configuration.cpp:
changed from usin getarg to my_opts
ndb/src/kernel/vm/Configuration.hpp:
removed const in main declaration
ndb/src/mgmclient/main.cpp:
changed from usin getarg to my_opts
ndb/src/mgmsrv/main.cpp:
changed from usin getarg to my_opts
ndb/src/ndbapi/Ndb.cpp:
fixed compiler warnings
ndb/test/run-test/Makefile.am:
moved getarg to test
ndb/test/src/Makefile.am:
moved getarg to test
ndb/test/src/getarg.c:
moved strlcat and strlcpy into getarg.c
ndb/tools/delete_all.cpp:
changed from usin getarg to my_opts
ndb/tools/desc.cpp:
changed from usin getarg to my_opts
ndb/tools/drop_index.cpp:
changed from usin getarg to my_opts
ndb/tools/drop_tab.cpp:
changed from usin getarg to my_opts
ndb/tools/listTables.cpp:
changed from usin getarg to my_opts
ndb/tools/select_all.cpp:
changed from usin getarg to my_opts
ndb/tools/select_count.cpp:
changed from usin getarg to my_opts
ndb/tools/waiter.cpp:
changed from usin getarg to my_opts
improved handling of bits in last word
ndb/include/ndbapi/NdbIndexOperation.hpp:
Removed copy paste index code
ndb/include/ndbapi/NdbOperation.hpp:
removed bits in last word
ndb/src/kernel/blocks/dbtux/DbtuxDebug.cpp:
fix debug print
ndb/src/ndbapi/NdbIndexOperation.cpp:
Removed copy paste index code
ndb/src/ndbapi/NdbOperationSearch.cpp:
better handling of bits in last word
Index scan/lookup (only scan specific fragment)
ndb/include/kernel/signaldata/TcIndx.hpp:
Removed TxIndxReq
ndb/include/ndbapi/NdbDictionary.hpp:
Removed
1) Tuple key
2) Distribution group
3) index only storage
ndb/include/ndbapi/NdbOperation.hpp:
Removed
1) Tuple key
2) Distribution group
3) index only storage
ndb/include/util/md5_hash.hpp:
Added possibility to get all 4 32-bit hash values
ndb/src/common/debugger/signaldata/SignalDataPrint.cpp:
Removed TxIndxReq
ndb/src/common/debugger/signaldata/TcIndx.cpp:
Removed TxIndxReq
ndb/src/common/util/md5_hash.cpp:
Added possibility to get all 4 32-bit hash values
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
removed fragbits from hash value
ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
removed unused frag offset (k+fragbits)
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
removed unused frag offset (k+fragbits)
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
Removed TxIndxReq
Removed distribution group
Added possibility for API to set fragment hash value
Split hashvalue into 2 32bit words
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Removed TxIndxReq
Removed distribution group
Added possibility for API to set fragment hash value
Split hashvalue into 2 32bit words
ndb/src/kernel/blocks/dbtux/Dbtux.hpp:
removed unused frag offset (k+fragbits)
ndb/src/kernel/blocks/dbtux/DbtuxMeta.cpp:
removed unused frag offset (k+fragbits)
ndb/src/ndbapi/NdbApiSignal.cpp:
Removed TxIndxReq
ndb/src/ndbapi/NdbDictionary.cpp:
Removed
1) Tuple key
2) Distribution group
3) index only storage
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Removed
1) Tuple key
2) Distribution group
3) index only storage
ndb/src/ndbapi/NdbDictionaryImpl.hpp:
Removed
1) Tuple key
2) Distribution group
3) index only storage
ndb/src/ndbapi/NdbIndexOperation.cpp:
Removed TxIndxReq
ndb/src/ndbapi/NdbOperation.cpp:
Removed
1) Tuple key
2) Distribution group
3) index only storage
ndb/src/ndbapi/NdbOperationDefine.cpp:
Removed
1) Tuple key
2) Distribution group
3) index only storage
ndb/src/ndbapi/NdbOperationExec.cpp:
Removed
1) Tuple key
2) Distribution group
3) index only storage
ndb/src/ndbapi/NdbOperationSearch.cpp:
Removed
1) Tuple key
2) Distribution group
3) index only storage
ndb/test/src/HugoOperations.cpp:
Removed
1) Tuple key
2) Distribution group
3) index only storage
ndb/test/src/NdbSchemaOp.cpp:
Removed
1) Tuple key
2) Distribution group
3) index only storage
