Logging to logging@openlogging.org accepted
DbtcMain.cpp, testTimeout.cpp:
Bug #11290 TransactionInactiveTimeout = 0 does not result in infinite timeout
ndb/test/ndbapi/testTimeout.cpp:
Bug #11290 TransactionInactiveTimeout = 0 does not result in infinite timeout
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Bug #11290 TransactionInactiveTimeout = 0 does not result in infinite timeout
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
script fixes for solaris
ndb/src/cw/cpcd/main.cpp:
fix usage of load_defaults, as it does have a short option
ndb/test/run-test/make-config.sh:
fix script wrt solaris
ndb/test/run-test/ndb-autotest.sh:
fix script wrt solaris
small script fixes
- Don't use hostname -s as it's linux specific
- Don't remove result unless scp worked
ndb/test/run-test/ndb-autotest.sh:
Don't use hostname -s as it's linux specific
Don't remove result unless scp worked
bug#10711
bug#10058
bug#9363
bug#9025
bug#8918
ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp:
Use UintPtr when computing page address to make sure that Uint32 does not overflow
into mysql.com:/home/jonas/src/mysql-5.0
ndb/src/kernel/blocks/backup/Backup.cpp:
Auto merged
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Auto merged
ndb/test/ndbapi/testNdbApi.cpp:
Auto merged
ndb/test/run-test/daily-basic-tests.txt:
Auto merged
ndb/tools/restore/Restore.cpp:
Auto merged
ndb/tools/restore/consumer_restore.cpp:
Auto merged
Fix potential inconsistency when running ndb_restore due to faulty parsing
of backup log wrt inserts
ndb/src/kernel/blocks/backup/Backup.cpp:
Make sure that entire stopGCP is in log
ndb/tools/restore/Restore.cpp:
Notice: this will not group and commit the deltas listed below
into a ChangeSet, because there are no ChangeSet comments.
Click [Checkin] again to check in only the commented deltas,
or type Control-l to go back and provide ChangeSet comments.
ndb/tools/restore/Restore.hpp:
Keep track of last gci to next iteration
ndb/tools/restore/consumer_restore.cpp:
Handle insert in log
Only allow certain errors
IPCConfig wasn't constructing the connect string properly.
ndb/src/common/mgmcommon/IPCConfig.cpp:
fix construction of connect string from configuration.
the port number was not being added correctly. This would cause the handle to default
to localhost:1186
incorrect handling of writeTuple with multi op transaction
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
1) Pass operation instead of insertIsDone to LQH
2) transform operation correctly when in parallell que
(multi op within same trans)
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Let ACC decide what operation was performed when WRITE
ndb/test/ndbapi/testNdbApi.cpp:
Add testcase for bug 11133
ndb/test/run-test/daily-basic-tests.txt:
Add testcase for bug 11133
into mysql.com:/home/jonas/src/mysql-5.0
configure.in:
Auto merged
libmysqld/Makefile.am:
Auto merged
strings/ctype-big5.c:
Auto merged
strings/ctype-ucs2.c:
Auto merged
BUG#9826 Server crash on schema change ("drop table", "alter table") with NDB
See note on 10948 for detailed explanation.
struct a { void* a; long long b[1]; };
on PPC32 (and 32bit pa risc): 16
on x86: 12
so a malloc(sizeof(void*)+extra_bits) is wrong.
Assuming that the long long is 64 bit aligned as non-aligned 64bit accesses
are rather expensive on ppc.
Thanks to paulus for doing the PPC port of valgrind.
Without which I would no doubt still be trying to find this.
ndb/src/ndbapi/DictCache.cpp:
Fix allocation size for Ndb_local_table_info for architectures such as PPC and PA-RISC (32bit)
where
struct a { void* a; long long b;};
is 64 bit aligned (i.e. sizeof(struct a)==16)
ndb/src/ndbapi/DictCache.hpp:
Add warning about having to be the last member in the structure
Bug #11050 ndb_mgm "show" prints incorrectly after master data node fails
ndb/src/mgmclient/CommandInterpreter.cpp:
Bug #11050 ndb_mgm "show" prints incorrectly after master data node fails
a node wo/ filesystem don't have any crashed replicas
reset noCrashedReplicas in invalidate_node_lcp
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
a node wo/ filesystem don't have any crashed replicas
ndb/src/common/transporter/SCI_Transporter.cpp:
Auto merged
ndb/src/common/transporter/SCI_Transporter.hpp:
Auto merged
ndb/src/common/transporter/SHM_Transporter.cpp:
Auto merged
ndb/src/common/transporter/SHM_Transporter.hpp:
Auto merged
ndb/src/common/transporter/TCP_Transporter.cpp:
Auto merged
ndb/src/common/transporter/TCP_Transporter.hpp:
Auto merged
ndb/src/common/transporter/TransporterRegistry.cpp:
Auto merged
ndb/src/mgmsrv/ConfigInfo.cpp:
Auto merged
ndb/src/ndbapi/NdbOperationExec.cpp:
Auto merged
ndb/test/ndbapi/testNdbApi.cpp:
Auto merged
add dummy getvalue
ndb/src/ndbapi/NdbOperationExec.cpp:
Add dummy get value of NDB$FRAGMENT if
dirty read wo/ get values
ndb/test/ndbapi/testNdbApi.cpp:
Test scans as well
BitKeeper/deleted/.del-ha_isam.cc~4dce65904db2675e:
Auto merged
BitKeeper/deleted/.del-ha_isammrg.cc~dc682e4755d77a2e:
Auto merged
client/sql_string.cc:
Auto merged
client/sql_string.h:
Auto merged
include/my_global.h:
Auto merged
include/my_sys.h:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysys/my_open.c:
Auto merged
mysys/raid.cc:
Auto merged
ndb/src/kernel/blocks/dbtux/Dbtux.hpp:
Auto merged
sql/field.cc:
Auto merged
sql/ha_berkeley.cc:
Auto merged
sql/ha_blackhole.cc:
Auto merged
sql/ha_heap.cc:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/ha_myisam.cc:
Auto merged
sql/ha_myisammrg.cc:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/item.cc:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_geofunc.cc:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/item_subselect.cc:
Auto merged
sql/item_sum.cc:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/item_uniq.cc:
Auto merged
sql/item_uniq.h:
Auto merged
sql/log_event.cc:
Auto merged
sql/log_event.h:
Auto merged
sql/procedure.cc:
Auto merged
sql/protocol.cc:
Auto merged
sql/protocol_cursor.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_analyse.cc:
Auto merged
sql/sql_analyse.h:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_map.cc:
Auto merged
sql/sql_olap.cc:
Auto merged
sql/sql_string.cc:
Auto merged
sql/sql_udf.cc:
Auto merged
sql/tztime.cc:
Auto merged
sql/opt_range.cc:
Manual merge
sql/sql_parse.cc:
Use select_lex pointer instead of lex->select_lex
sql/sql_repl.cc:
Function moved to log.cc, fix made there instead
sql/sql_class.cc:
Auto merged
sql/sql_select.cc:
Auto merged
ndb_restore invalid handling of distribution keys when restoring meta data
(also aligned printout with that of ndb_desc)
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Don't call it a distribution key if all keys are set as distribution key
ndb/tools/Makefile.am:
Use same format as desc when printing meta in ndb_restore
ndb/tools/restore/Restore.cpp:
Use same format as desc when printing meta in ndb_restore
client/mysqldump.c:
Auto merged
include/my_global.h:
Auto merged
mysql-test/r/mysqldump.result:
Auto merged
mysql-test/r/select.result:
Auto merged
mysql-test/t/mysqldump.test:
Auto merged
sql/item.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
support-files/mysql.spec.sh:
Auto merged
client/client_priv.h:
Manual merge (still to be corrected!)
--database option to hugo tools
ndb/test/ndbapi/testNdbApi.cpp:
Testcase for bug#10669
ndb/test/tools/hugoLoad.cpp:
Add --database=<name> to hugo tools
ndb/test/tools/hugoPkUpdate.cpp:
Add --database=<name> to hugo tools
ndb/test/tools/hugoScanRead.cpp:
Add --database=<name> to hugo tools
ndb/test/tools/hugoScanUpdate.cpp:
Add --database=<name> to hugo tools
ndb/test/run-test/ndb-autotest.sh:
ndb autotest
1) merge jonathan changes
2) add --no-report (if dont't want to produce/scp a report)
3) add --no-config (if don't want to create a configuration, i.e there is already one present)
4) add --no-test (for not actually starting test)
5) add checking of conf file
ndb/src/common/util/File.cpp:
my_stat returns NULL on failure, not non-zero.
i.e. exactly the opposite of stat(2).
providing confusion for unix programmers, who expect errors to be non-zero.
Clean up File_class::exists(char*) to use the my_stat interface properly.
