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
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
Disable tests of lock upgrade paths that are currently unsupported
ndb/test/ndbapi/testOperations.cpp:
Disable lock upgrade paths that currently unsupported
mysys/Makefile.am:
Added Base64 to mysys
ndb/config/type_ndbapi.mk.am:
NDBAPI now dependent on mysys
ndb/config/type_util.mk.am:
NDB UTIL now dependent on mysys
ndb/src/common/util/Makefile.am:
Remove Base64
ndb/src/common/util/Parser.cpp:
Removed dead code
ndb/src/mgmapi/mgmapi.cpp:
Use of mysys Base64
ndb/src/mgmsrv/Services.cpp:
Use of mysys Base64
include/base64.h:
Making Base64 mysys-style
mysys/base64.c:
Making Base64 mysys-compatible
- ensure in ndb_mgmd that the stop command is not issued if a node is restarting
- added some new error messages
- in ndbcntr on master check so that node does not shutdown id shutdoen in progress
