mysql-test/r/ndb_condition_pushdown.result:
bug#34107 lower scanfilter max size to not hit TUP limit
mysql-test/t/ndb_condition_pushdown.test:
bug#34107 lower scanfilter max size to not hit TUP limit
ndb/include/ndbapi/ndbapi_limits.h:
bug#34107 lower scanfilter max size to not hit TUP limit
make sure that getField does not write after supplied buffer
(recommit to correct clone, for easy merging)
ndb/include/util/Bitmask.hpp:
ndb- bug#33750
make sure that getField does not write after supplied buffer
ndb/src/common/util/Bitmask.cpp:
ndb- bug#33750
make sure that getField does not write after supplied buffer
ndb/test/ndbapi/testBitfield.cpp:
move test from Bitmask.cpp into testBitfield
for automatic testing
Add new variable m_highest_seen when only peeking at auto_increment NEXTID and not retrieving to cache. Add new method to check tupleId before calling data node
ndb_restore.result, ndb_restore.test:
Changed test to use information_schema to check auto_increment
DictCache.cpp, Ndb.cpp:
Add new variable m_highest_seen when only peeking at auto_increment NEXTID and not retrieving to cache. Add new method to check tupleId before calling data node. When setting the auto_increment value we'll also read up the new value, this is useful if we use the table the first time in this MySQL Server and haven't yet seen the NEXTID value. The kernel will avoid updating since it already has the value but will also read up the NEXTID value to ensure we don't need to do this any more time.
ndb_auto_increment.result:
Updated result file since it was incorrect
ndb/include/ndbapi/Ndb.hpp:
Add new variable m_highest_seen when only peeking at auto_increment NEXTID and not retrieving to cache. Add new method to check tupleId before calling data node
ndb/src/ndbapi/DictCache.hpp:
Add new variable m_highest_seen when only peeking at auto_increment NEXTID and not retrieving to cache. Add new method to check tupleId before calling data node
ndb/src/ndbapi/DictCache.cpp:
Add new variable m_highest_seen when only peeking at auto_increment NEXTID
and not retrieving to cache. Add new method to check tupleId before calling
data node. When setting the auto_increment value we'll also read up the new
value, this is useful if we use the table the first time in this MySQL Server
and haven't yet seen the NEXTID value. The kernel will avoid updating since it
already has the value but will also read up the NEXTID value to ensure we
don't need to do this any more time.
ndb/src/ndbapi/Ndb.cpp:
Add new variable m_highest_seen when only peeking at auto_increment NEXTID
and not retrieving to cache. Add new method to check tupleId before calling
data node. When setting the auto_increment value we'll also read up the new
value, this is useful if we use the table the first time in this MySQL Server
and haven't yet seen the NEXTID value. The kernel will avoid updating since
it already has the value but will also read up the NEXTID value to ensure we
don't need to do this any more time.
mysql-test/r/ndb_restore.result:
Changed test to use information_schema to check auto_increment
mysql-test/t/ndb_restore.test:
Changed test to use information_schema to check auto_increment
mysql-test/r/ndb_auto_increment.result:
Updated result file since it was incorrect
into loke.(none):/home/knielsen/devel/mysql-5.0-ndb
ndb/include/kernel/AttributeHeader.hpp:
Auto merged
ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
Auto merged
ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
Auto merged
ndb/src/kernel/blocks/dbutil/DbUtil.cpp:
Auto merged
ndb/src/ndbapi/NdbOperationDefine.cpp:
SCCS merged
Fix problem with AttributeHeader::init() seen with gcc 4.2.1.
Using the same object as both Uint32 and class AttributeHeader violates
strict aliasing rule.
ndb/include/kernel/AttributeHeader.hpp:
Fix problem with AttributeHeader::init() seen with gcc 4.2.1.
Using the same object as both Uint32 and class AttributeHeader violates
strict aliasing rule.
ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
Fix problem with AttributeHeader::init() seen with gcc 4.2.1.
Using the same object as both Uint32 and class AttributeHeader violates
strict aliasing rule.
ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
Fix problem with AttributeHeader::init() seen with gcc 4.2.1.
Using the same object as both Uint32 and class AttributeHeader violates
strict aliasing rule.
ndb/src/kernel/blocks/dbutil/DbUtil.cpp:
Fix problem with AttributeHeader::init() seen with gcc 4.2.1.
Using the same object as both Uint32 and class AttributeHeader violates
strict aliasing rule.
ndb/src/ndbapi/NdbOperationDefine.cpp:
Fix problem with AttributeHeader::init() seen with gcc 4.2.1.
Using the same object as both Uint32 and class AttributeHeader violates
strict aliasing rule.
Our web server has been restructured several times, and references
to it in our source code has stayed the same. This patch from Paul
DuBois updates all URLs to modern semantics.
debian/po/ca.po:
Change URLs.
debian/po/cs.po:
Change URLs.
debian/po/da.po:
Change URLs.
debian/po/gl.po:
Change URLs.
debian/po/ja.po:
Change URLs.
debian/po/pt_BR.po:
Change URLs.
debian/po/sv.po:
Change URLs.
debian/po/tr.po:
Change URLs.
mysql-test/lib/mtr_report.pl:
Change URLs.
mysql-test/mysql-test-run-shell.sh:
Change URLs.
ndb/include/ndbapi/Ndb.hpp:
Change URLs.
netware/mysql_test_run.c:
Change URLs.
scripts/mysqld_safe.sh:
Change URLs.
sql/mysqld.cc:
Change URLs.
mysql-test/r/ndb_condition_pushdown.result:
if ScanFilter is too large, abort or optionaly discard it
mysql-test/t/ndb_condition_pushdown.test:
if ScanFilter is too large, abort or optionaly discard it
ndb/include/kernel/signaldata/ScanTab.hpp:
if ScanFilter is too large, abort or optionaly discard it
ndb/include/ndbapi/Ndb.hpp:
if ScanFilter is too large, abort or optionaly discard it
ndb/include/ndbapi/NdbScanFilter.hpp:
if ScanFilter is too large, abort or optionaly discard it
ndb/include/ndbapi/ndbapi_limits.h:
if ScanFilter is too large, abort or optionaly discard it
ndb/src/ndbapi/NdbScanFilter.cpp:
if ScanFilter is too large, abort or optionaly discard it
ndb/src/ndbapi/NdbScanOperation.cpp:
if ScanFilter is too large, abort or optionaly discard it
ndb/src/ndbapi/ndberror.c:
if ScanFilter is too large, abort or optionaly discard it
sql/ha_ndbcluster_cond.cc:
if ScanFilter is too large, abort or optionaly discard it
ndb/include/kernel/ndb_limits.h:
1) define a macro MAX_DATA_NODE_ID to set the max ID of data nodes to be MAX_NDB_NODES - 1
2) define a macro MAX_NODES_ID to set the max ID of API and MGM to be MAX_NODES -1
ndb/src/mgmsrv/ConfigInfo.cpp:
1) replace MAX_NODES with MAX_DATA_NODE_ID (= MAX_NDB_NODES - 1) when the NodeId represents data nodes.
2) replace MAX_NODES with MAX_NODES_ID (= MAX_NODES -1) when the NodeId represents API or MGM nodes.
timoOutLoopStartLab() checks if any transactions have been delayed
for so long that we are forced to perform some action (e.g. abort,
resend etc).
It is *MEANT* to (according to the comment):
> To avoid aborting both transactions in a deadlock detected by time-out
> we insert a random extra time-out of upto 630 ms by using the lowest
> six bits of the api connect reference.
> We spread it out from 0 to 630 ms if base time-out is larger than 3 sec,
> we spread it out from 0 to 70 ms if base time-out is smaller than 300 msec,
> and otherwise we spread it out 310 ms.
The comment (as all do) lies.
the API connect reference is not very random, producing incredibly
predictable "random" numbers. This could lead to both txns being
aborted instead of just one.
Before:
timeout value: 123 3
timeout value: 122 2
timeout value: 122 2
timeout value: 122 2
timeout value: 123 3
After:
timeout value: 127 7
timeout value: 126 6
timeout value: 129 9
timeout value: 139 19
timeout value: 137 17
timeout value: 151 31
timeout value: 130 10
timeout value: 132 12
Index: ndb-work/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
===================================================================
ndb/src/common/util/Makefile.am:
BUG#30379 Better randomise time before retry in timeout check (DBTC)
ndb/include/util/ndb_rand.h:
BUG#30379 Better randomise time before retry in timeout check (DBTC)
ndb/src/common/util/ndb_rand.c:
BUG#30379 Better randomise time before retry in timeout check (DBTC)
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
BUG#30379 Better randomise time before retry in timeout check (DBTC)
ndb/include/mgmapi/ndb_logevent.h:
Add page_size_bytes member variable for MemoryUsage. And don't remove page_size_kb member variable at present for the compatibility backward.
ndb/src/mgmapi/ndb_logevent.cpp:
change the page_size_kb member variable of MemoryUsage to page_size_bytes
ndb/include/debugger/EventLogger.hpp:
add definition for new printLogEvent() function in CommandInterpreter.cpp
ndb/src/mgmclient/CommandInterpreter.cpp:
add a printLogEvent() function to print log event;
filter "<PING>" by ndb_logevent_get_next() in event_thread_run();
filter "<PING>" by ndb_logevent_get_next() in executeStartBackup();
and make executeStartBackup() same in both 5.0 and 5.1
ndb/src/mgmclient/Makefile.am:
add link to use ndb_logevent_get_next()
mysql-test/r/ndb_backup_print.result:
testcase result for ndb_backup_print
produced by mysql_test_run.pl
mysql-test/t/ndb_backup_print.test:
add testcase for ndb_mgm -e "start backup", check outupt format
into ymer.(none):/usr/local/mysql/mysql-5.0-ndb
ndb/include/ndbapi/NdbScanOperation.hpp:
Auto merged
ndb/src/ndbapi/NdbBlob.cpp:
Auto merged
ndb/src/ndbapi/NdbScanOperation.cpp:
Auto merged
ndb/test/run-test/daily-basic-tests.txt:
Auto merged
ndb/test/ndbapi/testBlobs.cpp:
Manual merge.
into ymer.(none):/usr/local/mysql/mysql-5.0-ndb
ndb/include/ndbapi/NdbTransaction.hpp:
Auto merged
ndb/src/ndbapi/NdbTransaction.cpp:
Auto merged
ndb/test/run-test/daily-basic-tests.txt:
Auto merged
NdbTransaction::executeAsynch() was not implemented. Add implementation.
ndb/include/ndbapi/NdbTransaction.hpp:
executeAsynch() should probably allow setting forceSend.
ndb/src/ndbapi/NdbTransaction.cpp:
Add missing implementation of executeAsynch().
ndb/test/ndbapi/testNdbApi.cpp:
Add test case.
ndb/test/run-test/daily-basic-tests.txt:
Add new test.
The old blob implementation had code that attempted to upgrade the lock mode for
LM_CommittedRead operations, but it did not work properly as it did not recompute
the operation flags.
As a consequence, reading a blob with LM_CommittedRead could return inconsistent
data, with different part of the read data being from different commits done by
other transactions.
The fix is to correctly recompute all necessary flags when upgrading lock mode.
ndb/include/kernel/signaldata/ScanTab.hpp:
Remove assumption in setXXX() methods that old value is zero, needed to allow blob
code to upgrade lock mode.
Fix spelling and commments.
ndb/include/ndbapi/NdbOperation.hpp:
Add method to change lock mode, to allow blob code to upgrade lock mode.
ndb/include/ndbapi/NdbScanOperation.hpp:
Add method to change lock mode, to allow blob code to upgrade lock mode.
ndb/src/ndbapi/NdbBlob.cpp:
Fix upgrading lock mode (old code had no effect).
ndb/src/ndbapi/NdbOperationDefine.cpp:
Add method to change lock mode, to allow blob code to upgrade lock mode.
ndb/src/ndbapi/NdbScanOperation.cpp:
Add method to change lock mode, to allow blob code to upgrade lock mode.
ndb/test/ndbapi/testBlobs.cpp:
Add testcase.
ndb/test/run-test/daily-basic-tests.txt:
Enable bug tests for auto test.
- try to catch as many malloc failures as possible and give error messages
ndb/src/ndbapi/ObjectMap.cpp:
New BitKeeper file ``ndb/src/ndbapi/ObjectMap.cpp''
correct cit printout
correct bit store retrieve
ndb/include/ndbapi/NdbRecAttr.hpp:
correct medium int printout
ndb/src/ndbapi/NdbRecAttr.cpp:
correct cit printout
sql/ha_ndbcluster.cc:
correct bit store retrieve
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-single-user
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
Auto merged
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
Auto merged
ndb/include/kernel/signaldata/DictTabInfo.hpp:
manual merge
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
manual merge
ndb/include/kernel/signaldata/DictTabInfo.hpp:
add single user mode field in table definition
ndb/include/ndb_constants.h:
new constants for single usermode option of tables
ndb/include/ndbapi/NdbDictionary.hpp:
add single user mode field in table definition
ndb/src/common/debugger/signaldata/DictTabInfo.cpp:
add single user mode field in table definition
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
add single user mode field in table definition
send this infor to TC
ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
add single user mode field in table definition
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
single user table mode on table object
merge some flags from uint8 to bits
get allow transaction to also check single user mode
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
single user table mode on table object
merge some flags from uint8 to bits
get allow transaction to also check single user mode
ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
set single user mode flag on system tables to make them always updatable
ndb/src/ndbapi/NdbDictionary.cpp:
get/set functions for single user mode on tables
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
get/set functions for single user mode on tables
ndb/src/ndbapi/NdbDictionaryImpl.hpp:
get/set functions for single user mode on tables
ndb/test/src/NDBT_Table.cpp:
print single user mode
Bug#26900 ndb_restore printout option does not give structured data
- add data stucturing options
- add database and table selection options
ndb/include/ndbapi/NdbRecAttr.hpp:
add formatting option to ndb recattr printing
ndb/include/util/OutputStream.hpp:
getter for FILE*
ndb/src/ndbapi/NdbRecAttr.cpp:
add formatting option to ndb recattr printing
ndb/tools/restore/Restore.cpp:
add formatting option to restore printing
adoption to 5.1 source code
ndb/tools/restore/Restore.hpp:
restore adoption to 5.1
ndb/tools/restore/consumer_printer.cpp:
add formatting option to restore printing
ndb/tools/restore/restore_main.cpp:
added option to restore only selected databases and tables
added option to get CSV printout to file and stdout
add formatting option to restore printing
adoption to 5.1 source code
into poseidon.mysql.com:/home/tomas/mysql-5.0-ndb
ndb/src/common/debugger/EventLogger.cpp:
Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Auto merged
into mysql.com:/home/my/mysql-5.0
mysys/my_thr_init.c:
Auto merged
ndb/include/util/OutputStream.hpp:
Auto merged
ndb/src/common/debugger/EventLogger.cpp:
Auto merged
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
Auto merged
ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
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/Dbtc.hpp:
Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
Auto merged
ndb/src/kernel/blocks/ndbcntr/Ndbcntr.hpp:
Auto merged
ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
Auto merged
ndb/src/kernel/blocks/qmgr/Qmgr.hpp:
Auto merged
ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
Auto merged
ndb/src/mgmapi/mgmapi.cpp:
Auto merged
ndb/src/mgmsrv/InitConfigFileParser.cpp:
Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
Auto merged
ndb/src/mgmsrv/MgmtSrvr.hpp:
Auto merged
ndb/src/mgmsrv/Services.cpp:
Auto merged
ndb/src/ndbapi/ClusterMgr.hpp:
Auto merged
ndb/src/ndbapi/SignalSender.cpp:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/mysqld.cc:
Auto merged
Fixed a couple of usage of not initialized warnings (unlikely cases)
client/mysqldump.c:
Fixed compiler warnings from 'max' build
client/mysqltest.c:
Removed compiler warnings
cmd-line-utils/readline/xmalloc.c:
Fixed compiler warnings from 'max' build
extra/comp_err.c:
Fixed compiler warnings from 'max' build
extra/yassl/include/openssl/ssl.h:
Changed prototype for SSL_set_fd() to fix compiler warnings (and possible errors) on windows 64 bit
extra/yassl/include/socket_wrapper.hpp:
Moved socket_t to ssl.h, to be able to removed compiler warnings on windows 64 bit
extra/yassl/src/ssl.cpp:
Changed prototype for SSL_set_fd() to fix compiler warnings (and possible errors) on windows 64 bit
extra/yassl/taocrypt/src/integer.cpp:
Fixed compiler warnings
include/my_global.h:
Added my_offsetof() macro from 5.1 to get rid of compiler warnings
innobase/include/ut0byte.ic:
Fixed compiler warnings on win64
innobase/include/ut0ut.ic:
Fixed compiler warnings on win64
libmysql/libmysql.def:
Fixed compiler warnings on win64
myisam/mi_packrec.c:
Fixed compiler warnings on win64
myisam/myisamchk.c:
Fixed compiler warnings from 'max' build
mysys/base64.c:
Fixed compiler warnings on win64
mysys/mf_keycache.c:
Fixed compiler warnings from 'max' build
mysys/my_getopt.c:
Fixed compiler warnings from 'max' build
mysys/my_init.c:
Fixed compiler warnings from 'max' build
mysys/my_thr_init.c:
Fixed compiler warnings
mysys/ptr_cmp.c:
Fixed compiler warnings from 'max' build
ndb/include/kernel/signaldata/DictTabInfo.hpp:
Fixed compiler warnings
server-tools/instance-manager/mysql_connection.cc:
Fixed compiler warnings
server-tools/instance-manager/mysqlmanager.cc:
Fixed compiler warnings
sql/filesort.cc:
Initalize variable that was used unitialized in error conditions
sql/ha_berkeley.cc:
Moved get_auto_primary_key() here as int5store() gives (wrong) compiler warnings in win64
sql/ha_berkeley.h:
Moved get_auto_primary_key() to ha_berkeley.cc
sql/ha_innodb.cc:
Fixed compiler warnings
sql/item.cc:
Fixed compiler warnings from 'max' build
sql/item_timefunc.cc:
Fixed compiler warnings
sql/mysqld.cc:
Fixed compiler warnings
sql/sql_acl.cc:
Fixed compiler warnings from 'max' build
sql/sql_base.cc:
Fixed compiler warnings from 'max' build
sql/sql_insert.cc:
Initialize variable that may be used unitialized on error conditions (not fatal)
sql/sql_prepare.cc:
Fixed compiler warnings from 'max' build
sql/sql_select.cc:
Fixed compiler warnings
sql/sql_show.cc:
Fixed compiler warnings
sql/udf_example.def:
Fixed compiler warnings on win64
sql/unireg.cc:
Initialize variable that may be used unitialized on error conditions
strings/ctype-ucs2.c:
Fixed compiler warnings
strings/ctype-utf8.c:
Fixed compiler warnings
strings/decimal.c:
Fixed compiler warnings
support-files/compiler_warnings.supp:
Ignore warnings from sql_yacc.cc that are hard to remove
Ignore some not important warnings from windows 64 bit build
tools/mysqlmanager.c:
Fixed compiler warnings
into mysql.com:/home/my/mysql-5.0
BitKeeper/etc/ignore:
auto-union
BUILD/SETUP.sh:
Auto merged
Makefile.am:
Auto merged
client/mysql.cc:
Auto merged
cmd-line-utils/readline/display.c:
Auto merged
configure.in:
Auto merged
extra/yassl/include/buffer.hpp:
Auto merged
extra/yassl/include/crypto_wrapper.hpp:
Auto merged
extra/yassl/include/yassl_imp.hpp:
Auto merged
extra/yassl/include/yassl_int.hpp:
Auto merged
extra/yassl/src/crypto_wrapper.cpp:
Auto merged
extra/yassl/taocrypt/include/algebra.hpp:
Auto merged
extra/yassl/taocrypt/include/des.hpp:
Auto merged
extra/yassl/taocrypt/include/hash.hpp:
Auto merged
extra/yassl/taocrypt/include/hmac.hpp:
Auto merged
extra/yassl/taocrypt/include/modarith.hpp:
Auto merged
extra/yassl/taocrypt/include/modes.hpp:
Auto merged
extra/yassl/taocrypt/include/rsa.hpp:
Auto merged
extra/yassl/taocrypt/include/type_traits.hpp:
Auto merged
extra/yassl/taocrypt/mySTL/list.hpp:
Auto merged
extra/yassl/taocrypt/src/aes.cpp:
Auto merged
extra/yassl/taocrypt/src/algebra.cpp:
Auto merged
extra/yassl/testsuite/testsuite.cpp:
Auto merged
include/my_global.h:
Auto merged
include/my_pthread.h:
Auto merged
libmysqld/lib_sql.cc:
Auto merged
myisam/mi_open.c:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/mysqltest.result:
Auto merged
mysql-test/t/mysqltest.test:
Auto merged
mysys/default.c:
Auto merged
ndb/src/common/transporter/Transporter.cpp:
Auto merged
ndb/src/common/util/File.cpp:
Auto merged
ndb/src/common/util/SocketClient.cpp:
Auto merged
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
Auto merged
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
Auto merged
ndb/src/kernel/blocks/qmgr/Qmgr.hpp:
Auto merged
ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
Auto merged
ndb/src/mgmapi/mgmapi.cpp:
Auto merged
ndb/src/mgmclient/CommandInterpreter.cpp:
Auto merged
ndb/src/mgmsrv/ConfigInfo.cpp:
Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
Auto merged
ndb/src/ndbapi/ClusterMgr.hpp:
Auto merged
ndb/src/ndbapi/Ndb.cpp:
Auto merged
ndb/src/ndbapi/NdbScanOperation.cpp:
Auto merged
ndb/src/ndbapi/SignalSender.cpp:
Auto merged
sql/field.cc:
Auto merged
sql/filesort.cc:
Auto merged
sql/ha_myisammrg.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/item_subselect.h:
Auto merged
sql/item_sum.cc:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/net_serv.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/opt_range.h:
Auto merged
sql/repl_failsafe.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/set_var.h:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_union.cc:
Auto merged
sql/sql_update.cc:
Auto merged
sql-common/client.c:
Auto merged
sql/sql_view.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/table.cc:
Auto merged
sql/unireg.cc:
Auto merged
extra/yassl/taocrypt/src/asn.cpp:
Manual merge (Fix shadowed variable name)
extra/yassl/taocrypt/test/test.cpp:
No changes
ndb/src/common/util/ConfigValues.cpp:
Manual merge (Fix shadowed variable name)
sql/field.h:
manual merge
sql/ha_myisam.cc:
manual merge
sql/ha_ndbcluster.cc:
manual merge
sql/item_cmpfunc.cc:
manual merge
sql/item_subselect.cc:
Manual merge (Fix shadowed variable name)
sql/mysqld.cc:
no changes
into willster.(none):/home/stewart/Documents/MySQL/5.0/ndb-merge
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
SCCS merged
remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
Remove the dead SET_VAR_REQ,REF,CONF signals.
They:
a) don't currently work
b) will cause confusion with future mgmd updates for
signal interface to configuration things (e.g. port numbers)
ndb/include/kernel/GlobalSignalNumbers.h:
remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
Remove the dead SET_VAR_REQ,REF,CONF signals.
They:
a) don't currently work
b) will cause confusion with future mgmd updates for
signal interface to configuration things (e.g. port numbers)
ndb/src/common/debugger/signaldata/SignalNames.cpp:
remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
Remove the dead SET_VAR_REQ,REF,CONF signals.
They:
a) don't currently work
b) will cause confusion with future mgmd updates for
signal interface to configuration things (e.g. port numbers)
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
Remove the dead SET_VAR_REQ,REF,CONF signals.
They:
a) don't currently work
b) will cause confusion with future mgmd updates for
signal interface to configuration things (e.g. port numbers)
ndb/src/kernel/blocks/cmvmi/Cmvmi.hpp:
remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
Remove the dead SET_VAR_REQ,REF,CONF signals.
They:
a) don't currently work
b) will cause confusion with future mgmd updates for
signal interface to configuration things (e.g. port numbers)
ndb/src/kernel/blocks/dbacc/Dbacc.hpp:
remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
Remove the dead SET_VAR_REQ,REF,CONF signals.
They:
a) don't currently work
b) will cause confusion with future mgmd updates for
signal interface to configuration things (e.g. port numbers)
ndb/src/kernel/blocks/dbacc/DbaccInit.cpp:
remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
Remove the dead SET_VAR_REQ,REF,CONF signals.
They:
a) don't currently work
b) will cause confusion with future mgmd updates for
signal interface to configuration things (e.g. port numbers)
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
Remove the dead SET_VAR_REQ,REF,CONF signals.
They:
a) don't currently work
b) will cause confusion with future mgmd updates for
signal interface to configuration things (e.g. port numbers)
ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
Remove the dead SET_VAR_REQ,REF,CONF signals.
They:
a) don't currently work
b) will cause confusion with future mgmd updates for
signal interface to configuration things (e.g. port numbers)
ndb/src/kernel/blocks/dbdih/DbdihInit.cpp:
remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
Remove the dead SET_VAR_REQ,REF,CONF signals.
They:
a) don't currently work
b) will cause confusion with future mgmd updates for
signal interface to configuration things (e.g. port numbers)
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
Remove the dead SET_VAR_REQ,REF,CONF signals.
They:
a) don't currently work
b) will cause confusion with future mgmd updates for
signal interface to configuration things (e.g. port numbers)
ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
Remove the dead SET_VAR_REQ,REF,CONF signals.
They:
a) don't currently work
b) will cause confusion with future mgmd updates for
signal interface to configuration things (e.g. port numbers)
ndb/src/kernel/blocks/dblqh/DblqhInit.cpp:
remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
Remove the dead SET_VAR_REQ,REF,CONF signals.
They:
a) don't currently work
b) will cause confusion with future mgmd updates for
signal interface to configuration things (e.g. port numbers)
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
Remove the dead SET_VAR_REQ,REF,CONF signals.
They:
a) don't currently work
b) will cause confusion with future mgmd updates for
signal interface to configuration things (e.g. port numbers)
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
Remove the dead SET_VAR_REQ,REF,CONF signals.
They:
a) don't currently work
b) will cause confusion with future mgmd updates for
signal interface to configuration things (e.g. port numbers)
ndb/src/kernel/blocks/dbtc/DbtcInit.cpp:
remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
Remove the dead SET_VAR_REQ,REF,CONF signals.
They:
a) don't currently work
b) will cause confusion with future mgmd updates for
signal interface to configuration things (e.g. port numbers)
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
Remove the dead SET_VAR_REQ,REF,CONF signals.
They:
a) don't currently work
b) will cause confusion with future mgmd updates for
signal interface to configuration things (e.g. port numbers)
ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
Remove the dead SET_VAR_REQ,REF,CONF signals.
They:
a) don't currently work
b) will cause confusion with future mgmd updates for
signal interface to configuration things (e.g. port numbers)
ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
Remove the dead SET_VAR_REQ,REF,CONF signals.
They:
a) don't currently work
b) will cause confusion with future mgmd updates for
signal interface to configuration things (e.g. port numbers)
ndb/src/kernel/blocks/ndbcntr/Ndbcntr.hpp:
remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
Remove the dead SET_VAR_REQ,REF,CONF signals.
They:
a) don't currently work
b) will cause confusion with future mgmd updates for
signal interface to configuration things (e.g. port numbers)
ndb/src/kernel/blocks/ndbcntr/NdbcntrInit.cpp:
remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
Remove the dead SET_VAR_REQ,REF,CONF signals.
They:
a) don't currently work
b) will cause confusion with future mgmd updates for
signal interface to configuration things (e.g. port numbers)
ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
Remove the dead SET_VAR_REQ,REF,CONF signals.
They:
a) don't currently work
b) will cause confusion with future mgmd updates for
signal interface to configuration things (e.g. port numbers)
ndb/src/kernel/blocks/qmgr/Qmgr.hpp:
remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
Remove the dead SET_VAR_REQ,REF,CONF signals.
They:
a) don't currently work
b) will cause confusion with future mgmd updates for
signal interface to configuration things (e.g. port numbers)
ndb/src/kernel/blocks/qmgr/QmgrInit.cpp:
remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
Remove the dead SET_VAR_REQ,REF,CONF signals.
They:
a) don't currently work
b) will cause confusion with future mgmd updates for
signal interface to configuration things (e.g. port numbers)
ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
Remove the dead SET_VAR_REQ,REF,CONF signals.
They:
a) don't currently work
b) will cause confusion with future mgmd updates for
signal interface to configuration things (e.g. port numbers)
ndb/src/mgmsrv/MgmtSrvr.hpp:
remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
Remove the dead SET_VAR_REQ,REF,CONF signals.
They:
a) don't currently work
b) will cause confusion with future mgmd updates for
signal interface to configuration things (e.g. port numbers)