Fix bug when restarting cluster after failure
(fs was not cleared)
Fix cosmetic bug that made rsync be run several times when gathering result
storage/ndb/test/run-test/main.cpp:
Fix bug when restarting cluster after failure
(fs was not cleared)
Fix cosmetic bug that made rsync be run several times when gathering result
1)
BUG#25507 "multi-row insert delayed + auto increment causes
duplicate key entries on slave" (two concurrrent connections doing
multi-row INSERT DELAYED to insert into an auto_increment column,
caused replication slave to stop with "duplicate key error" (and
binlog was wrong), and BUG#26116 "If multi-row INSERT
DELAYED has errors, statement-based binlogging breaks" (the binlog
was not accounting for all rows inserted, or slave could stop).
The fix is that: in statement-based binlogging, a multi-row INSERT
DELAYED is silently converted to a non-delayed INSERT.
This is supposed to not affect many 5.1 users as in 5.1, the default
binlog format is "mixed", which does not have the bug (the bug is
only with binlog_format=STATEMENT).
We should document how the system delayed_insert thread decides of
its binlog format (which is not modified by this patch):
this decision is taken when the thread is created
and holds until it is terminated (is not affected by any later change
via SET GLOBAL BINLOG_FORMAT). It is also not affected by the binlog
format of the connection which issues INSERT DELAYED (this binlog
format does not affect how the row will be binlogged).
If one wants to change the binlog format of its server with SET
GLOBAL BINLOG_FORMAT, it should do FLUSH TABLES to be sure all
delayed_insert threads terminate and thus new threads are created,
taking into account the new format.
2)
BUG#24432
"INSERT... ON DUPLICATE KEY UPDATE skips auto_increment values".
When in an INSERT ON DUPLICATE KEY UPDATE, using
an autoincrement column, we inserted some autogenerated values and
also updated some rows, some autogenerated values were not used
(for example, even if 10 was the largest autoinc value in the table
at the start of the statement, 12 could be the first autogenerated
value inserted by the statement, instead of 11). One autogenerated
value was lost per updated row. Led to exhausting the range of the
autoincrement column faster.
Bug introduced by fix of BUG#20188; present since 5.0.24 and 5.1.12.
This bug breaks replication from a pre-5.0.24/pre-5.1.12 master.
But the present bugfix, as it makes INSERT ON DUP KEY UPDATE
behave like pre-5.0.24/pre-5.1.12, breaks replication from a
[5.0.24,5.0.34]/[5.1.12,5.1.15]
master to a fixed (5.0.36/5.1.16) slave! To warn users against this when
they upgrade their slave, as agreed with the support team, we add
code for a fixed slave to detect that it is connected to a buggy
master in a situation (INSERT ON DUP KEY UPDATE into autoinc column)
likely to break replication, in which case it cannot replicate so
stops and prints a message to the slave's error log and to SHOW SLAVE
STATUS.
For 5.0.36->[5.0.24,5.0.34] replication or 5.1.16->[5.1.12,5.1.15]
replication we cannot warn as master
does not know the slave's version (but we always recommended to users
to have slave at least as new as master).
As agreed with support, I have asked for an alert to be put into
the MySQL Network Monitoring and Advisory Service.
3) note that I'll re-enable rpl_insert_id as soon as 5.1-rpl gets
the changes from the main 5.1.
BitKeeper/deleted/.del-rpl_insert_delayed.result:
Delete: mysql-test/r/rpl_insert_delayed.result
mysql-test/extra/rpl_tests/rpl_insert_delayed.test:
tests for BUG#25507 (lauch many concurrent INSERT DELAYED into an auto_inc
column and see if they cause duplicates) and BUG#26116 (see if one error
at first row on master makes the slave's data incorrect).
It is then incorporated into a statement-based and mixed binlogging
test, and into a row-based test.
It is in fact mysql-test/t/rpl_insert_delayed.test from 5.0, renamed
and extended to test BUG#25507.
mysql-test/extra/rpl_tests/rpl_insert_id.test:
manual merge of test for BUG#24432
"INSERT... ON DUPLICATE KEY UPDATE skips auto_increment values"
from 5.0
mysql-test/r/rpl_insert_id.result:
result update (it automerged from 5.0, contrary to the test file)
mysql-test/r/rpl_known_bugs_detection.result:
result update (binlog event sizes differ from 5.0)
mysql-test/t/disabled.def:
rpl_insert_id tests statement-based replication of INSERT ON
DUPLICATE KEY UPDATE. This type of INSERT had BUG#24432, which is
fixed in 5.1.16; we made the slave detect if it is connected to a
<5.1.16 master and if so refuse to replicate.
The problem is that this 5.1-rpl tree, even though it will produce
the 5.1.16 release, still has a 5.1.15 version in configure.in.
Thus rpl_insert_id fails. So I disable it. As soon as the 5.1-rpl
tree gets the changesets from the main 5.1, its version will change
to 5.1.16 and so I'll be able to re-enable the test.
mysql-test/t/rpl_known_bugs_detection.test:
only in statement-based; row-based has no bug so test would fail.
sql/slave.cc:
slave_print_msg(ERROR_LEVEL) calls my_error(ER_UNKNOWN_ERROR);
so, for our my_printf_error(), which has a nicer message than this
my_error(), to have any effect, it must be
called before slave_print_msg()
sql/sql_insert.cc:
manual merge from 5.0 of a piece of the fixes for
BUG#24432 "INSERT... ON DUPLICATE KEY UPDATE skips auto_increment values"
BUG#25507 "multi-row insert delayed + auto increment causes
duplicate key entries on slave"
BUG#26116 "If multi-row INSERT DELAYED has errors, statement-based
binlogging breaks".
The other pieces (e.g. log_event.cc) automerged from 5.0.
mysql-test/r/rpl_row_insert_delayed.result:
result
mysql-test/r/rpl_stm_insert_delayed.result:
result. Note how "mixed" and "statement" insert different data in
the table.
mysql-test/t/rpl_row_insert_delayed.test:
wrapper to test INSERT DELAYED binlogging in row-based mode
mysql-test/t/rpl_stm_insert_delayed.test:
wrapper to test INSERT DELAYED binlogging in statement-based and mixed
mode
fix ao_ignore behavior change in hugo
(affecting testOperations & testTransactions)
storage/ndb/test/src/HugoOperations.cpp:
fix ao_ignore behavior change in hugo
into gbichot3.local:/home/mysql_src/mysql-5.1-rpl-25507
mysql-test/r/rpl_insert_id.result:
Auto merged
sql/log.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/log_event.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/slave.h:
Auto merged
mysql-test/t/rpl_insert_id.test:
will merge by hand
sql/sql_insert.cc:
will fix by hand
When opening/creating the transaction coordinator's log, if binlog is
used, the tc log is the binlog so we use the binlog's name; otherwise
we use the mmap-based log, named after the mandatory argument of the
--log-tc option (meant for that).
sql/log.cc:
fixing wrong order of arguments to my_create()
(3rd param is the desired modes of the file; "0" lead to no rights
for anybody on the file).
sql/mysqld.cc:
When opening/creating the transaction coordinator's log, if binlog is
used, the tc log is the binlog so we use the binlog's name; otherwise
we use the mmap-based log, named after the mandatory argument of the
--log-tc option (meant for that).
duplicate key entries on slave" (two concurrrent connections doing
multi-row INSERT DELAYED to insert into an auto_increment column,
caused replication slave to stop with "duplicate key error" (and
binlog was wrong)), and BUG#26116 "If multi-row INSERT
DELAYED has errors, statement-based binlogging breaks" (the binlog
was not accounting for all rows inserted, or slave could stop).
The fix is that: if (statement-based) binlogging is on, a multi-row
INSERT DELAYED is silently converted to a non-delayed INSERT.
Note: it is not possible to test BUG#25507 in 5.0 (requires mysqlslap),
so it is tested only in the changeset for 5.1. However, BUG#26116
is tested here, and the fix for BUG#25507 is the same code change.
mysql-test/r/innodb-replace.result:
result update
mysql-test/t/innodb-replace.test:
now that multi-row delayed inserts are converted to normal inserts
if the statement-based binlog is enabled,
no error is issued even if this engine does not support INSERT DELAYED,
as the insert does not go through the INSERT DELAYED code.
To preserve the goal of this test, we change the statements to single-
row inserts.
sql/sql_insert.cc:
A multi-row INSERT DELAYED cannot be recorded to a statement-based
binlog in a way that describes the insertions actually done;
in that case we fallback to a non-delayed INSERT.
mysql-test/r/rpl_insert_delayed.result:
result. Master and slave match.
mysql-test/t/rpl_insert_delayed.test:
Test for BUG#26116 (see if one error at first row on master makes the
slave's data incorrect, see if one error at second row on master
makes slave stop).
were evaluated.
According to the new rules for string comparison partial indexes on text
columns can be used in the same cases when partial indexes on varchar
columns can be used.
mysql-test/r/endspace.result:
Adjusted results after the fix for bug #25971.
mysql-test/r/innodb.result:
Adjusted results after the fix for bug #25971.
mysql-test/r/myisam.result:
Adjusted results after the fix for bug #25971.
mysql-test/r/select.result:
Added a test case for bug #25971.
mysql-test/r/type_blob.result:
Adjusted results after the fix for bug #25971.
mysql-test/t/select.test:
Added a test case for bug #25971.
index_read(), whereas it must return HA_ERR_END_OF_FILE
instead (as there are by definition no rows in a table of
that engine.
mysql-test/r/blackhole.result:
Bug#19717: test case
mysql-test/t/blackhole.test:
Bug#19717: test case
sql/ha_blackhole.cc:
Bug#19717: return no rows instead of success.
into chilla.local:/home/mydev/mysql-5.1-axmrg
mysys/my_pthread.c:
Auto merged
sql/item.cc:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/sql_select.cc:
Auto merged
into chilla.local:/home/mydev/mysql-5.0-axmrg
sql/item.cc:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/sql_select.cc:
Auto merged
into willster.(none):/home/stewart/Documents/MySQL/5.1/ndb-merge
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
SCCS merged
into poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
mysql-test/ndb/ndb_config_2_node.ini:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
storage/ndb/src/common/debugger/EventLogger.cpp:
Auto merged
storage/ndb/src/ndbapi/ObjectMap.hpp:
Auto merged
mysql-test/ndb/ndbcluster.sh:
manual merge
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
getting BACKUP_FRAGMENT_REF in LQH from BACKUP would bail on
ndbrequire(false) instead of having good error message.
Can re-use error code from BACKUP as it's a FsRef error code,
which is NDBD_EXIT... except when it isn't.
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Report the correct error code on exit with failure to backup fragment (run LCP)
into willster.(none):/home/stewart/Documents/MySQL/5.1/ndb-work
storage/ndb/include/kernel/GlobalSignalNumbers.h:
Auto merged
storage/ndb/src/common/debugger/signaldata/SignalNames.cpp:
Auto merged
storage/ndb/src/common/util/OutputStream.cpp:
Auto merged
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.hpp:
Auto merged
storage/ndb/src/kernel/blocks/dbacc/Dbacc.hpp:
Auto merged
storage/ndb/src/kernel/blocks/dbacc/DbaccInit.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihInit.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhInit.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/dbtc/DbtcInit.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
Auto merged
storage/ndb/src/kernel/blocks/ndbcntr/Ndbcntr.hpp:
Auto merged
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrInit.cpp:
Auto merged
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
Auto merged
storage/ndb/src/kernel/blocks/qmgr/QmgrInit.cpp:
Auto merged
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
Auto merged
storage/ndb/src/mgmapi/mgmapi.cpp:
Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.hpp:
Auto merged
storage/ndb/src/mgmsrv/Services.cpp:
Auto merged
storage/ndb/src/mgmsrv/Services.hpp:
Auto merged
storage/ndb/include/mgmapi/mgmapi.h:
merge
storage/ndb/include/util/OutputStream.hpp:
merge
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
merge
storage/ndb/src/kernel/blocks/qmgr/Qmgr.hpp:
merge
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)
into poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
Auto merged
storage/ndb/src/kernel/vm/WatchDog.cpp:
Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
Auto merged
storage/ndb/src/ndbapi/ClusterMgr.cpp:
Auto merged
storage/ndb/src/ndbapi/ClusterMgr.hpp:
Auto merged
storage/ndb/src/ndbapi/SignalSender.hpp:
Auto merged
storage/ndb/include/kernel/signaldata/DumpStateOrd.hpp:
manual merge
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
manual merge
storage/ndb/src/ndbapi/SignalSender.cpp:
manual merge
remove GSN_STATISTICS_REQ and CONF
These are unused and have been since BK import. not needed.
ndb/include/kernel/GlobalSignalNumbers.h:
remove STATISTICS_REQ and CONF
ndb/src/common/debugger/signaldata/SignalNames.cpp:
remove signal names for STATISTICS_REQ and CONF (unused)
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
remove unused STATISTICS signals
ndb/src/kernel/blocks/cmvmi/Cmvmi.hpp:
remove unused STATISTICS signals
Don't send uninit data in TAMPER_ORD to DIHNDBTAMPER
Even though this data is unused from the CMVMI (mgmd) signal,
we shouldn't be doing stuff with uninited data.
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
init the 3rd word of DIHNDBTAMPER before sending to DIH.
ndb/include/mgmapi/mgmapi.h:
use constant for max log level in ndb_mgmd.
(more useful in 5.1 due to other defines and refinements of mgmapi)
ndb/src/mgmsrv/Services.cpp:
fix the XXX fixme of constant for max log level
there is backwards compatibility for GET CONFIG style configuration requests in
ndb_mgmd. None of the ndbd versions that use this couldn't possibly connect to a
5.0 or 5.1 cluster. remove the backwards compat
remove it
ndb/src/mgmsrv/Services.cpp:
remove MGM_GET_CONFIG_BACKWARDS_COMPAT code.
any client using GET CONFIG will just not work with modern NDB.
ndb/src/mgmsrv/Services.hpp:
remove GET CONFIG support
indicate units in SocketOutputStream timeout
rename timeout in SocketOutputStream to reflect units (ms)
In 5.0 as well as is safe cleanup patch that will help with merging.
ndb/include/util/OutputStream.hpp:
rename timeout in SocketOutputStream to reflect units (ms)
ndb/src/common/util/OutputStream.cpp:
rename timeout in SocketOutputStream to reflect units (ms)
- signals where sometimes sent too early when setting up subscriptions
ndb/include/kernel/signaldata/DumpStateOrd.hpp:
added dump for active subscriptions in cmvmi
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
added dump for active subscriptions in cmvmi
ndb/src/mgmsrv/MgmtSrvr.cpp:
bug in that signals where sent prior to api reg conf arrived, causing thrown away signals and subsequent hangs in mgmtserver
also add retry if node connected but not yet received api reg conf
ndb/src/ndbapi/ClusterMgr.cpp:
added status variable m_api_reg_conf in cluster manager to correctly be able to determine if a node is sendable
ndb/src/ndbapi/ClusterMgr.hpp:
added status variable m_api_reg_conf in cluster manager to correctly be able to determine if a node is sendable
ndb/src/ndbapi/SignalSender.cpp:
assert to see that node is sendable when signal is sent
ndb/src/ndbapi/SignalSender.hpp:
manke metchd const
into olga.mysql.com:/home/igor/mysql-5.1-opt
BitKeeper/etc/gone:
auto-union
mysql-test/r/select.result:
Auto merged
mysql-test/t/select.test:
Auto merged
mysys/my_getopt.c:
Auto merged
sql/field.h:
Auto merged
sql/item.cc:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/table.cc:
Auto merged
into olga.mysql.com:/home/igor/mysql-5.1-opt
BitKeeper/etc/gone:
auto-union
mysys/my_getopt.c:
Auto merged
sql/field.h:
Auto merged
sql/item.cc:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/table.cc:
Auto merged
mysql-test/r/select.result:
SCCS merged
mysql-test/t/select.test:
SCCS merged
