into perch.ndb.mysql.com:/home/jonas/src/50-work
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Auto merged
better error message on invalid config change
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
fix typo
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Change error message...note that this is a guess
into perch.ndb.mysql.com:/home/jonas/src/50-work
ndb/src/kernel/blocks/ERROR_codes.txt:
Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Auto merged
ndb/src/ndbapi/NdbImpl.hpp:
Auto merged
ndb/src/ndbapi/NdbRecAttr.cpp:
Auto merged
ndb/src/ndbapi/ndb_cluster_connection.cpp:
Auto merged
When scan is completed, but lqhkeyreq is outstanding on primary replica and
starting node dies, scan will not be closed leading to error handling of failed
node not completing
ndb/src/kernel/blocks/ERROR_codes.txt:
New error code
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Set scan state to WAIT_LQHKEY_COPY when scan is finished but LQHKEYREQ is outstanding
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push
mysql-test/r/ndb_basic.result:
Auto merged
mysql-test/t/ndb_basic.test:
Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
ndb/src/kernel/vm/SimulatedBlock.cpp:
merge
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
ndb/test/ndbapi/testNodeRestart.cpp:
Auto merged
ndb/src/kernel/blocks/ERROR_codes.txt:
merge
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
merge
ndb/test/run-test/daily-basic-tests.txt:
merge
into perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-push
ndb/src/ndbapi/NdbImpl.hpp:
Auto merged
ndb/src/ndbapi/NdbRecAttr.cpp:
Auto merged
ndb/src/ndbapi/ndb_cluster_connection.cpp:
Auto merged
Error in abort handling in TC when timeout during abort
ndb/src/kernel/blocks/ERROR_codes.txt:
New error codes
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
New error codes
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Dont release transaction record to early
ndb/test/ndbapi/testNodeRestart.cpp:
Test case
ndb/test/run-test/daily-basic-tests.txt:
Test case
Fix race between INCL_NODEREQ(prio b) and GCP_PREPARE(prio a) by also waiting for starting nodes
ndb/include/ndb_version.h.in:
Handle upgrade of bug fix
ndb/src/kernel/blocks/ERROR_codes.txt:
New error code for delaying INCL_NODE_REQ
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Fix race between INCL_NODEREQ(prio b) and GCP_PREPARE(prio a)
by also waiting for starting nodes
ndb/test/ndbapi/testNodeRestart.cpp:
Add testcase for bug#15632
Fix error in NF during NR
ndb/include/kernel/signaldata/DumpStateOrd.hpp:
Add dump for ERROR 5002 with specified table
ndb/src/kernel/blocks/ERROR_codes.txt:
Add dump for ERROR 5002 with specified table
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Run updateNodeInfo if failed node is not in list of storedReplicas
ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
Add dump for ERROR 5002 with specified table
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Add dump for ERROR 5002 with specified table
ndb/test/ndbapi/testNodeRestart.cpp:
Add testcase for bug#15587
ndb/test/run-test/daily-basic-tests.txt:
Add testcase for bug#15587
mysql-test/r/update.result:
Auto merged
mysql-test/t/update.test:
Auto merged
ndb/src/kernel/blocks/backup/Backup.cpp:
Auto merged
sql/sql_update.cc:
Auto merged
ndb/src/kernel/blocks/backup/Backup.cpp:
If crash 10018 is inserted on a 2 node cluster with fast CPU and slower disk,
all nodes can respond with BACKUP_FRAGMENT_CONF for all fragments before the
error in FSAPPENDCONF is hit.
This would mean that no error code was set for the backup and that it would
be incomplete as not all IO had been written to disk before the node crash.
This would not be reported to the user.
So the backup would appear to succeed but it really didn't.
The window for this is rather small though.
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Assert is incorrect for testBackup NFSlave test (causes crash insert 10015 to fail)
In the rare circumstance where a mysqld connects to a mgm server, then the
mgm server goes away before a node id can be allocated, it was possible to get
an Error in mgm protocol parser error message.
ndb/src/common/mgmcommon/ConfigRetriever.cpp:
When allocating node id, retry connecting to a management server if it goes away.
ndb/src/mgmapi/mgmapi.cpp:
Treat Eof and NoLine results from the parser as a sign that we should disconnect
from this management server. It's up to the caller to work out if they want
to try again.
into mysql.com:/home/jimw/my/mysql-5.0-clean
client/mysql.cc:
Auto merged
configure.in:
Auto merged
mysql-test/t/mix_innodb_myisam_binlog.test:
Auto merged
mysql-test/r/mix_innodb_myisam_binlog.result:
Resolve conflict
sql/item_func.cc:
Resolve conflict
sql/sql_show.cc:
Resolve conflicts
mysql-test/r/ndb_charset.result:
bug#14007 test [re-commit]
mysql-test/t/ndb_charset.test:
bug#14007 test [re-commit]
ndb/include/kernel/AttributeDescriptor.hpp:
bug#14007 4.1 need getSizeInBytes [re-commit]
ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
bug#14007 4.1 *** do not AUTOmerge to 5.0 *** [re-commit]
Add display of minimum requirements for various cluster parameters
e.g. DataMemory, IndexMemory, MaxNoOfTables, MaxNoOfAttributes etc
and the memory usage because of them.
ndb/tools/ndb_size.pl:
Computer minimum parameter settings (MaxNoOfTables, Attributes, Indexes, Triggers) and the memory usage because of these settings.
ndb/tools/ndb_size.tmpl:
display parameters
fix some small bugs, slightly improve output, add --help
ndb/tools/ndb_size.pl:
Provide --help and --usage.
Fix some bugs related to quoting table names.
ndb/tools/ndb_size.tmpl:
A NAME and A HREF to tables from the main list
Makefile.am:
Auto merged
client/Makefile.am:
Auto merged
libmysql/Makefile.am:
Auto merged
libmysql_r/Makefile.am:
Auto merged
libmysqld/Makefile.am:
Auto merged
mysql-test/Makefile.am:
Auto merged
netware/Makefile.am:
Auto merged
support-files/Makefile.am:
Auto merged
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
ndb/src/ndbapi/NdbRecAttr.cpp:
Auto merged
ndb/src/ndbapi/NdbImpl.hpp:
merge
ndb/src/ndbapi/ndb_cluster_connection.cpp:
merge
memleak when doing ordered index scan on index with column larger than 32 bytes
(recommit for merge to 5.0)
ndb/src/ndbapi/NdbImpl.hpp:
Fix order of free lists so that destructors are run in correct order
ndb/src/ndbapi/NdbRecAttr.cpp:
Dont allocate theStorageX twice
ndb/src/ndbapi/ndb_cluster_connection.cpp:
Destroy mutexes
memleak when doing ordered index scan on index with column larger than 32 bytes
ndb/src/ndbapi/NdbImpl.hpp:
Fix order of free lists so that destructors are run in correct order
ndb/src/ndbapi/NdbRecAttr.cpp:
Dont allocate theStorageX twice
ndb/src/ndbapi/ndb_cluster_connection.cpp:
Destroy mutexes
into mysql.com:/usr/home/bar/mysql-5.0.b12371
mysql-test/t/ctype_utf8.test:
Auto merged
mysql-test/t/show_check.test:
Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
sql/sql_yacc.yy:
Auto merged
mysql-test/r/ctype_utf8.result:
After merge fix.
mysql-test/r/show_check.result:
After merge fix.
sql/item_strfunc.h:
After merge fix.
tests/mysql_client_test.c:
After merge fix.
ndb/include/kernel/signaldata/DumpStateOrd.hpp:
New dump for index operation count
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
New dump for index operation count
Fix leak on index ops
