ndb/include/kernel/signaldata/AlterTable.hpp:
Add error code for backup in progress
ndb/include/kernel/signaldata/DictTabInfo.hpp:
Add backup state
ndb/include/kernel/signaldata/DropTable.hpp:
Add error code for backup in progress
ndb/include/ndbapi/NdbDictionary.hpp:
Add backup state
ndb/src/kernel/blocks/backup/Backup.cpp:
1) remove invalid require (util_sequence_ref) crash
2) Don't backup objects dropping/creating
3) set correct error code on backup fragment ref (crash)
4) save TrigAttrInfo header when getting log full (crash)
5) lock/unlock tables during backup
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
1) add mutex lock/unlock as part of drop/alter table
2) add lock/unlock for backup
3) remove TC from backup trigger loop
ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
Add BACKUP_ONGOING state
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Add backup state
ndb/src/ndbapi/ndberror.c:
Add error code for backup in progress
ndb/test/ndbapi/testBackup.cpp:
Add testcase for testBackup -n BackupDDL
ndb/tools/drop_index.cpp:
Fix ndb_drop_index
ndb/tools/listTables.cpp:
Print of backup state
into mysql.com:/home/jimw/my/mysql-5.0-clean
extra/perror.c:
Auto merged
include/my_global.h:
Auto merged
mysql-test/r/ps_1general.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/ps_7ndb.result:
Auto merged
mysql-test/r/select.result:
Auto merged
ndb/src/mgmsrv/ConfigInfo.cpp:
Auto merged
ndb/src/mgmsrv/main.cpp:
Auto merged
sql/des_key_file.cc:
Auto merged
sql/field_conv.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_select.cc:
Auto merged
tests/mysql_client_test.c:
Auto merged
mysql-test/t/select.test:
Resolve conflicts
scripts/mysqld_safe.sh:
Resolve conflict
sql/item.cc:
Resolve conflict, don't return FIELD_TYPE_BLOB since VARCHAR
can be longer in 5.0 than 4.1.
sql/log_event.cc:
Resolve conflict
sql/mysql_priv.h:
Resolve conflict
sql/mysqld.cc:
Remove incorrect fix (merge from 4.1)
sql/sql_show.cc:
Resolve conflict
BUG#12028, cannot use default section for hostname in cluster config
made clearer error message
ndb/src/mgmsrv/ConfigInfo.cpp:
BUG#12028, cannot use default section for hostname in cluster config
made clearer error message
ndb/src/kernel/blocks/ERROR_codes.txt:
fix some bugs in protocols drop index etc
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
fix some bugs in protocols drop index etc
ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
fix some bugs in protocols drop index etc
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
fix some bugs in protocols drop index etc
ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp:
fix some bugs in protocols drop index etc
mysql-test/t/ctype_utf8.test:
Auto merged
ndb/src/common/mgmcommon/ConfigRetriever.cpp:
Auto merged
ndb/src/common/transporter/Transporter.hpp:
Auto merged
ndb/src/common/transporter/TransporterRegistry.cpp:
Auto merged
ndb/src/mgmclient/CommandInterpreter.cpp:
Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
Auto merged
ndb/src/mgmsrv/MgmtSrvr.hpp:
Auto merged
ndb/src/mgmsrv/Services.cpp:
Auto merged
sql/sql_prepare.cc:
Auto merged
support-files/mysql.spec.sh:
Auto merged
tests/mysql_client_test.c:
Auto merged
ndb/include/transporter/TransporterRegistry.hpp:
SCCS merged
ndb/src/common/transporter/Transporter.cpp:
SCCS merged
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-new
mysql-test/t/ctype_utf8.test:
Auto merged
ndb/src/common/mgmcommon/ConfigRetriever.cpp:
Auto merged
ndb/src/common/transporter/TransporterRegistry.cpp:
Auto merged
ndb/src/mgmclient/CommandInterpreter.cpp:
Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
Auto merged
ndb/src/mgmsrv/MgmtSrvr.hpp:
Auto merged
ndb/src/mgmsrv/Services.cpp:
Auto merged
sql/sql_prepare.cc:
Auto merged
ndb/include/util/SocketServer.hpp:
Auto merged
ndb/src/common/mgmcommon/ConfigRetriever.cpp:
Auto merged
ndb/src/common/util/SocketClient.cpp:
Auto merged
ndb/src/common/util/SocketServer.cpp:
Auto merged
ndb/src/common/util/version.c:
Auto merged
ndb/src/kernel/blocks/qmgr/Qmgr.hpp:
Auto merged
ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
Auto merged
ndb/src/mgmclient/main.cpp:
Auto merged
ndb/src/mgmsrv/MgmtSrvr.hpp:
Auto merged
ndb/src/ndbapi/ClusterMgr.cpp:
Auto merged
ndb/tools/restore/restore_main.cpp:
Auto merged
ndb/include/util/ndb_opts.h:
merge
ndb/src/common/mgmcommon/IPCConfig.cpp:
merge
ndb/src/common/transporter/TransporterRegistry.cpp:
merge
ndb/src/mgmapi/mgmapi.cpp:
merge
ndb/src/mgmclient/CommandInterpreter.cpp:
merge
ndb/src/mgmsrv/MgmtSrvr.cpp:
merge
ndb/src/mgmsrv/Services.cpp:
merge
ndb/src/mgmsrv/main.cpp:
merge
ndb/src/ndbapi/TransporterFacade.cpp:
merge
added using ndb_end and showing mem allocation stat at exit
added init of variable
added destruction of LocalConfig to still memleak
added delete of theFacade on exit
stopSessions(true) on socket server to ensure destuction of threads
added destruction of arbit manager thread
added true option to stopSessions in transporter facade to ensure destructions of threads
ndb/include/util/ndb_opts.h:
added using ndb_end and showing mem allocation stat at exit
ndb/src/common/logger/LogHandler.cpp:
added init of variable
ndb/src/mgmapi/mgmapi.cpp:
added destruction of LocalConfig to still memleak
debug printouts
ndb/src/mgmclient/main.cpp:
added using ndb_end and showing mem allocation stat at exit
ndb/src/mgmsrv/MgmtSrvr.cpp:
added delete of theFacade on exit
removed area51
added debug prints
ndb/src/mgmsrv/main.cpp:
added using ndb_end and showing mem allocation stat at exit
moved glob struct to heap to enable ndb_end usage
moved options out of glob struct
stopSessions(true) on socket server to ensure destuction of threads
ndb/src/ndbapi/ClusterMgr.cpp:
added destruction of arbit manager thread
debug printouts
ndb/src/ndbapi/TransporterFacade.cpp:
added true option to stopSessions in transporter facade to ensure destructions of threads
+ debug prints
+ added close of some fd's
+ debug prints
ndb/src/mgmclient/CommandInterpreter.cpp:
BUG#11898 ndb_mgmd not releasing resources, added "ping"
+ debug prints
ndb/src/mgmsrv/MgmtSrvr.hpp:
BUG#11898 ndb_mgmd not releasing resources, added "ping"
+ debug prints
ndb/src/mgmsrv/Services.cpp:
BUG#11898 ndb_mgmd not releasing resources, added "ping" on add_listener
+ added close of some fd's
+ debug prints
added __LINE__ so systemErrorLab for better error printout
ndb/include/ndb_version.h.in:
stilled mem leak in usage on getVersionString
ndb/include/util/version.h:
stilled mem leak in usage on getVersionString
ndb/src/common/util/version.c:
stilled mem leak in usage on getVersionString
ndb/src/kernel/blocks/qmgr/Qmgr.hpp:
added __LINE__ so systemErrorLab for better error printout
ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
stilled mem leak in usage on getVersionString
added __LINE__ so systemErrorLab for better error printout
ndb/tools/restore/restore_main.cpp:
stilled mem leak in usage on getVersionString
Fix closing of sessions on mgm server shutdown.
ndb/include/mgmcommon/ConfigRetriever.hpp:
Add disconnect();
ndb/src/common/mgmcommon/ConfigRetriever.cpp:
Add disconnect() call so we can disconnect from the mgm server before it shuts down
(if we are a mgm server).
ndb/src/mgmsrv/main.cpp:
Close our ConfigRetriever connection first.
Stop sessions, and wait for them to stop. (previously we didn't wait, this was
causing core dumps on shutdown with failed nodes).
add lots of printouts when stop is detected
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
If waiting for GCP_SAVE_REQ
just kill nodes we're waiting for
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Add lots of printouts when crashing due to GCP stop
fix bug in MemoryChannel
ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp:
Don't signal when reporting to NDBFS
ndb/src/kernel/blocks/ndbfs/MemoryChannel.hpp:
1) add new method which don't signal
2) remove wait(0) from tryReadChannel
fix handling of write's in lock queue
add test case
add support for pkWrite+async exec in HugoOperations
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
Handle operation type wrt ZWRITE when restarting operations
ndb/test/include/HugoOperations.hpp:
Add support for
1) pkWriteRecord
2) async execute
ndb/test/ndbapi/testNdbApi.cpp:
Extend test case for bug#11133 with multi transaction tests aswell...
ndb/test/src/HugoOperations.cpp:
Add support for
1) pkWriteRecord
2) async execute
Display the (more commonly accurate) message that the mgm server closed our connection
and that we'll retry connecting to it.
ndb/src/common/transporter/TransporterRegistry.cpp:
Fix error message in case of mgm disconnecting before we finished asking it for dynamic ports
ndb/src/mgmapi/mgmapi.cpp:
Only display a mgm protocol error in the case of the mgm server having disconnected.
Change ndb_mgm_is_connected to actually poll the socket to see if it's still open.
into linux.site:/home/marty/MySQL/mysql-5.0
BitKeeper/etc/logging_ok:
auto-union
configure.in:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysys/default.c:
Auto merged
ndb/include/transporter/TransporterDefinitions.hpp:
Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Auto merged
ndb/test/ndbapi/testBlobs.cpp:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
strings/ctype-big5.c:
Auto merged
strings/ctype-ucs2.c:
Auto merged
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
client/mysqltest.c:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
into neptunus.(none):/home/msvensson/mysql/bug10365
sql/ha_ndbcluster.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_table.cc:
Auto merged
ndb/src/common/mgmcommon/ConfigRetriever.cpp:
Auto merged
ndb/test/ndbapi/testBlobs.cpp:
Auto merged
sql/sql_select.cc:
Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
ul
This fixes the problem in 5.0 in the correct way.
The previous patch (for 4.1) is only valid for 4.1 and is done at the right time
for 4.1.
ndb/src/kernel/main.cpp:
The ndbd angel process keeps the mgm connection open as it retains a reference
to the socket.
this means that when the mgm server is killed, the socket stays in CLOSE_WAIT
(the ndb process will close() it okay in 5.0, as we reused it for a transporter
but this isn't enough as the angel process still has a reference to that socket).
so, by adding in a theConfig->closeConfiguration(); in the angel process, the ndb
process is left with the only reference to the socket - which it can close whenever
it likes (namely when the connection is terminated).
The 4.1 fix is not valid for 5.0. Remove it.
ndb/src/common/mgmcommon/ConfigRetriever.cpp:
This fix is not valid for 5.0 as we use the mgm server connection for more than
just fetching the initial configuration
In 4.1 (it is different in 5.0), we do not use the mgm connection after fetching the
configuration (and if we did, we would have to have calls to check the connection and
reconnect if needed - in case the mgm server had restarted) so we can disconnect after
first use.
This means we won't have connections stuck in CLOSE_WAIT when the mgm server shuts down.
ndb/src/common/mgmcommon/ConfigRetriever.cpp:
Disconnect from management server after configuration is fetched.
