storage/ndb/src/kernel/blocks/dbacc/DbaccInit.cpp:
if malloc failed, it will show the parameter's name
storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
if malloc failed, it will show the parameter's name
storage/ndb/src/kernel/vm/ArrayPool.hpp:
reduce err message, or else some of it will be cut
storage/ndb/src/kernel/vm/SimulatedBlock.cpp:
add the feature which it can display the parameter's name if malloc failed
storage/ndb/src/kernel/vm/SimulatedBlock.hpp:
add an input argument which is the ID of a parameter
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
client/mysqldump.c:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/sql_show.cc:
Auto merged
storage/ndb/src/ndbapi/NdbTransaction.cpp:
Auto merged
sql/sql_class.h:
Fixed indentation
If we have the XFS headers (at build time) we can use XFS specific ioctls
(once testing the file is on XFS) to better allocate space.
This dramatically improves performance of mysql-test-run cases as well:
e.g.
number of extents for ndb_dd_basic tablespaces and log files
BEFORE this patch: 57, 13, 212, 95, 17, 113
WITH this patch : ALL 1 or 2 extents
(results are consistent over multiple runs. BEFORE always has several files
with lots of extents).
As for timing of test run:
BEFORE
ndb_dd_basic [ pass ] 107727
real 3m2.683s
user 0m1.360s
sys 0m1.192s
AFTER
ndb_dd_basic [ pass ] 70060
real 2m30.822s
user 0m1.220s
sys 0m1.404s
(results are again consistent over various runs)
similar for other tests (BEFORE and AFTER):
ndb_dd_alter [ pass ] 245360
ndb_dd_alter [ pass ] 211632
configure.in:
Check for XFS headers
storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp:
If the XFS headers are installed, use the xfsctl(XFS_IOC_RESVSP64) call (a
wrapper around ioctl) to tell the xfs file system how much space to reserve
for this file.
Make sure index scan does not commitDelete
mysql-test/r/ndb_index_ordered.result:
testcase
mysql-test/t/ndb_index_ordered.test:
testcase
storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
Make sure index scan does not commitDelete
into perch.ndb.mysql.com:/home/jonas/src/51-work
storage/ndb/src/ndbapi/NdbTransaction.cpp:
Auto merged
storage/ndb/src/common/util/socket_io.cpp:
merge
nicer error message to user, along with error code to help track down the problem.
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Report error when creating table (restartCreateTab_dihComplete)
to user in a nicer way.
BUG#22305 SysLogHandler not thread safe
BUG#22313 can get duplicate log messages in cluster log
Fix all these problems with one patch. Make Logger, hence EventLogger (with a
bit more) thread safe.
storage/ndb/include/debugger/EventLogger.hpp:
remove m_text to make thread safe
storage/ndb/include/logger/Logger.hpp:
Use mutex to protect member variables for multithreaded use.
storage/ndb/src/common/debugger/EventLogger.cpp:
use a string on the stack instead of member variable to make class thread safe
storage/ndb/src/common/logger/Logger.cpp:
use mutexes to Guard member variables. makes class therad safe
into willster.(none):/home/stewart/Documents/MySQL/5.1/ndb-mgm-work
storage/ndb/include/logger/FileLogHandler.hpp:
Auto merged
storage/ndb/include/util/File.hpp:
Auto merged
storage/ndb/src/common/logger/FileLogHandler.cpp:
Auto merged
storage/ndb/src/common/util/File.cpp:
Auto merged
into bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
include/mysql.h:
Auto merged
libmysqld/lib_sql.cc:
Auto merged
mysql-test/include/mix1.inc:
Auto merged
mysql-test/r/ctype_utf8.result:
Auto merged
BitKeeper/deleted/.del-make_win_bin_dist:
Auto merged
mysql-test/r/innodb_mysql.result:
Auto merged
mysql-test/r/ndb_update.result:
Auto merged
mysql-test/r/ps.result:
Auto merged
mysql-test/r/view.result:
Auto merged
mysql-test/t/ctype_utf8.test:
Auto merged
mysql-test/t/func_gconcat.test:
Auto merged
mysql-test/t/ps.test:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_func.h:
Auto merged
sql/item_sum.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_update.cc:
Auto merged
sql/sql_view.cc:
Auto merged
sql/table.cc:
Auto merged
storage/myisammrg/ha_myisammrg.cc:
Auto merged
storage/ndb/src/common/util/SimpleProperties.cpp:
Auto merged
storage/ndb/src/mgmsrv/Services.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbTransaction.cpp:
Auto merged
storage/ndb/tools/ndb_size.pl:
Auto merged
storage/ndb/tools/ndb_size.tmpl:
Auto merged
sql/sql_table.cc:
SCCS merged
into trift2.:/MySQL/M51/push-5.1
configure.in:
Auto merged
sql/sql_yacc.yy:
Auto merged
storage/ndb/src/mgmsrv/Services.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
Auto merged
into dev3-138.dev.cn.tlan:/home/zhl/mysql/mysql-5.1/bug21052
storage/ndb/include/ndbapi/ndberror.h:
Auto merged
storage/ndb/src/mgmsrv/Services.cpp:
Auto merged
storage/ndb/src/ndbapi/ndberror.c:
Auto merged
into ymer.(none):/usr/local/mysql/mysql-5.1-new-ndb
storage/ndb/include/util/UtilBuffer.hpp:
Auto merged
storage/ndb/src/common/util/SimpleProperties.cpp:
Auto merged
revert fix bug#21052 as it's wrong, and induces bus-error on node crashes
storage/ndb/src/mgmsrv/Services.cpp:
revert fix bug#21052 as it's wrong, and induces bus-error on node crashes
into perch.ndb.mysql.com:/home/jonas/src/51-work
storage/ndb/include/kernel/ndb_limits.h:
Auto merged
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
Auto merged
storage/ndb/src/kernel/blocks/backup/Backup.hpp:
merge
storage/ndb/src/common/util/File.cpp:
Avoid memory leak when EINTR error returns. Even though a close error happens, a ERROR message in out-file is given, and this shouldn't affect the normally running.
added check in ndb_mgmd so that the sum of MaxNoOfTables, MaxNoOfOrderedIndexes, MaxNoOfUniqueHashIndexes and the number of System Tables must not overflow the max Uint32 number.
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
the sum of MaxNoOfTables, MaxNoOfOrderedIndexes, MaxNoOfUniqueHashIndexes and the number of System Tables must not overflow the max value of Uint32.
and use it for testOperations/testTransactions
storage/ndb/test/include/NDBT_Test.hpp:
Add support for temporary tables in hugo
storage/ndb/test/ndbapi/testOperations.cpp:
Make testOperations use temporary tables
storage/ndb/test/ndbapi/testTransactions.cpp:
Make testTransactions use temporary tables
storage/ndb/test/src/NDBT_Tables.cpp:
Add support for temporary tables in hugo
storage/ndb/test/src/NDBT_Test.cpp:
Add support for temporary tables in hugo
fix another incorrect assertion
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
clear m_transaction_nodes.clear()
to avoid asserion in debug-compiled in releaseApiCon
Dont assert when getting gci=0 in read only transaction
storage/ndb/src/ndbapi/NdbTransaction.cpp:
Dont assert when getting gci=0 in read only transaction
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
Add a parameter id parameter for setSize method. When allocating memory error results in ndbd exit can gives exact parameter name in error log.
make sure not to release log buffer twice (or several times) in case of abort of multi update
storage/ndb/src/kernel/blocks/dbtup/DbtupAbort.cpp:
make sure not to release log buffer twice (or several times) in case of abort of multi update
ndb_restore tool should create them.
storage/ndb/tools/restore/consumer.hpp:
Add create apply_status and schema system table method when they don't exist.
storage/ndb/tools/restore/consumer_restore.cpp:
Implement to create apply_status and schema system table method when they don't exist.
storage/ndb/tools/restore/consumer_restore.hpp:
Add create apply_status and schema system table method when they don't exist.
storage/ndb/tools/restore/restore_main.cpp:
if apply_status and schema system tables don't exist, create them also.
into willster.(none):/home/stewart/Documents/MySQL/5.1/bug19914-mk2-merge
BitKeeper/deleted/.del-ha_berkeley.cc:
Auto merged
BitKeeper/deleted/.del-ha_berkeley.h:
Auto merged
mysql-test/r/ctype_utf8.result:
Auto merged
mysql-test/t/ctype_utf8.test:
Auto merged
sql/item_sum.cc:
Auto merged
sql/opt_sum.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_union.cc:
Auto merged
sql/sql_view.cc:
Auto merged
sql/table.cc:
Auto merged
storage/archive/ha_archive.cc:
Auto merged
storage/blackhole/ha_blackhole.cc:
Auto merged
storage/blackhole/ha_blackhole.h:
Auto merged
storage/csv/ha_tina.cc:
Auto merged
storage/csv/ha_tina.h:
Auto merged
storage/example/ha_example.cc:
Auto merged
storage/example/ha_example.h:
Auto merged
storage/federated/ha_federated.cc:
Auto merged
storage/federated/ha_federated.h:
Auto merged
storage/heap/ha_heap.cc:
Auto merged
storage/heap/ha_heap.h:
Auto merged
storage/myisam/ha_myisam.h:
Auto merged
storage/myisammrg/ha_myisammrg.cc:
Auto merged
storage/ndb/include/kernel/GlobalSignalNumbers.h:
Auto merged
storage/ndb/include/mgmapi/mgmapi.h:
Auto merged
storage/ndb/include/ndb_version.h.in:
Auto merged
storage/ndb/include/ndbapi/NdbTransaction.hpp:
Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
storage/ndb/src/kernel/vm/Configuration.cpp:
Auto merged
storage/ndb/src/mgmapi/mgmapi.cpp:
Auto merged
storage/ndb/src/mgmclient/main.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbTransaction.cpp:
Auto merged
storage/ndb/tools/ndb_condig.cpp:
Auto merged
storage/ndb/tools/restore/restore_main.cpp:
Auto merged
sql/ha_ndbcluster.cc:
merge
sql/ha_ndbcluster.h:
merge
sql/handler.h:
merge
sql/sql_delete.cc:
merge
storage/archive/ha_archive.h:
merge
storage/innobase/handler/ha_innodb.cc:
merge
storage/innobase/handler/ha_innodb.h:
merge
storage/myisam/ha_myisam.cc:
merge
storage/myisammrg/ha_myisammrg.h:
merge
Early abort, failing to allocate buffers, would go down the abort track and
end up trying to sendDropTriggers (as the standard stop backup does).
However, it is possible to not have any tables yet defined in the backup
(due to allocating buffers is before this). Simple check in sendDropTrig
(and continue to next step). Files may be open, so we continue to close them.
Also updated ERROR_Codes (and added one to test this bug).
storage/ndb/src/kernel/blocks/ERROR_codes.txt:
update BACKUP error insert codes to reflect current reality.
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
Allow for early abort when no tables have been included in backup.
Allow for abort when file records have been seized but not yet allocated
to specific uses (is the case when buffer allocation fails)
storage/ndb/src/kernel/blocks/backup/Backup.hpp:
initialize BackupRecord file Ptrs
storage/ndb/test/src/NdbBackup.cpp:
Add extra failure codes for buffer allocation failure in backup
Fix uninit variable, causing problems with auto-increment on rhas3-x86 (only found on this platform, really weird)
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
Fix uninit variable, causing problems with auto-increment on rhas3-x86 (only found on this platform, really weird)
correct segment fault in setSize(),
and improve the error message with displaying the specific parameter's name if malloc fail
storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
add an argument refer to the ID of a parameter which will be malloced
storage/ndb/src/kernel/vm/ArrayPool.hpp:
in setSize(), correct the segment default due to overflow of two 32-bit interger's multiply
storage/ndb/include/mgmapi/mgmapi.h:
add a new function declaration
storage/ndb/src/mgmapi/Makefile.am:
add a link of a new file ParamInfo.cpp which locate in mgmsrv dir
storage/ndb/src/mgmapi/mgmapi_configuration.cpp:
add a new mgmapi function ndb_mgm_get_db_parameter_info
storage/ndb/src/mgmsrv/ParamInfo.cpp:
New BitKeeper file ``storage/ndb/src/mgmsrv/ParamInfo.cpp''
initialization information of all parameters, this copy from mgmsrv/ConfigInfo.cpp
storage/ndb/src/mgmsrv/ParamInfo.hpp:
New BitKeeper file ``storage/ndb/src/mgmsrv/ParamInfo.hpp''
found with gcc 4.0.2 on Itanium2
(ndb_dd_* failures)
storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp:
Fix some potentil alias problems
storage/ndb/src/kernel/vm/Pool.hpp:
Fix potential alias problem
config/ac-macros/ha_ndbcluster.m4:
re-introduce NDB_SIZEOF substitutions to prevent NdbApi depending on my_config
which causes problems for autotools enabled ndbapi programs
storage/ndb/include/ndb_types.h.in:
remove dependency on my_config.h that was causing problems for ndbapi programs
using autoconf
into perch.ndb.mysql.com:/home/jonas/src/51-work
storage/ndb/src/common/debugger/EventLogger.cpp:
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/dbtup/DbtupGen.cpp:
merge
into perch.ndb.mysql.com:/home/jonas/src/51-work
storage/ndb/src/kernel/blocks/ERROR_codes.txt:
Auto merged
storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
merge
added date & time stamp for the messages that will be printed to the mysqld message file.
storage/ndb/src/common/transporter/OSE_Receiver.cpp:
added date & time stamp for the messages.
storage/ndb/src/common/transporter/TCP_Transporter.cpp:
added date & time stamp for the messages.
storage/ndb/src/common/transporter/TransporterRegistry.cpp:
added date & time stamp for the messages.
into mysql.com:/home/bk/MERGE/mysql-5.1-merge
include/my_sys.h:
Auto merged
mysql-test/t/view.test:
Auto merged
sql/log.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/share/errmsg.txt:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_insert.cc:
Auto merged
storage/ndb/src/mgmapi/mgmapi.cpp:
Auto merged
ndb_restore Return OK even if temporary errors
(otherwise mysql-test-run/ndb_restore can fail on really slow machines)
storage/ndb/tools/restore/restore_main.cpp:
Return OK even if temporary errors
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
client/mysqldump.c:
Auto merged
client/mysqltest.c:
Auto merged
mysql-test/r/csv.result:
Auto merged
mysql-test/r/ctype_utf8.result:
Auto merged
mysql-test/r/func_time.result:
Auto merged
mysql-test/t/csv.test:
Auto merged
mysql-test/t/ctype_utf8.test:
Auto merged
mysql-test/t/func_time.test:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_view.cc:
Auto merged
sql/table.cc:
Auto merged
storage/csv/ha_tina.cc:
Auto merged
storage/innobase/btr/btr0btr.c:
Auto merged
storage/innobase/buf/buf0buf.c:
Auto merged
storage/innobase/dict/dict0dict.c:
Auto merged
storage/innobase/fil/fil0fil.c:
Auto merged
storage/innobase/fsp/fsp0fsp.c:
Auto merged
storage/innobase/handler/ha_innodb.cc:
Auto merged
storage/innobase/include/btr0cur.ic:
Auto merged
storage/innobase/log/log0log.c:
Auto merged
storage/innobase/log/log0recv.c:
Auto merged
storage/innobase/os/os0file.c:
Auto merged
storage/innobase/row/row0mysql.c:
Auto merged
storage/innobase/row/row0sel.c:
Auto merged
storage/innobase/srv/srv0start.c:
Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
tests/mysql_client_test.c:
Auto merged
into perch.ndb.mysql.com:/home/jonas/src/51-work
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
storage/ndb/test/ndbapi/testTimeout.cpp:
Auto merged
into romeo.(none):/home/bk/b19459-mysql-5.1-new
client/mysqlbinlog.cc:
Auto merged
include/my_sys.h:
Auto merged
mysys/base64.c:
Auto merged
sql/log_event.cc:
Auto merged
sql/log_event.h:
Auto merged
storage/ndb/src/mgmapi/mgmapi.cpp:
Auto merged
sql/share/errmsg.txt:
SCCS merged
into willster.(none):/home/stewart/Documents/MySQL/5.1/bug13987
Merge 5.0-ndb into 5.1-ndb
storage/ndb/include/mgmapi/mgmapi.h:
Auto merged
storage/ndb/src/kernel/vm/Configuration.cpp:
Auto merged
storage/ndb/include/mgmapi/mgmapi_debug.h:
Auto merged
storage/ndb/include/util/Parser.hpp:
Auto merged
storage/ndb/include/util/socket_io.h:
Auto merged
storage/ndb/src/common/util/InputStream.cpp:
Auto merged
storage/ndb/src/common/util/Parser.cpp:
Auto merged
storage/ndb/src/common/util/socket_io.cpp:
Auto merged
storage/ndb/src/cw/cpcd/main.cpp:
Auto merged
storage/ndb/src/mgmapi/mgmapi.cpp:
Auto merged
storage/ndb/src/mgmclient/main.cpp:
Auto merged
storage/ndb/src/mgmsrv/Services.cpp:
Auto merged
storage/ndb/src/mgmsrv/Services.hpp:
Auto merged
storage/ndb/src/mgmsrv/main.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbTransaction.cpp:
Auto merged
storage/ndb/test/ndbapi/testMgm.cpp:
Auto merged
storage/ndb/tools/delete_all.cpp:
Auto merged
storage/ndb/tools/drop_index.cpp:
Auto merged
storage/ndb/tools/drop_tab.cpp:
Auto merged
storage/ndb/tools/listTables.cpp:
Auto merged
storage/ndb/tools/select_count.cpp:
Auto merged
storage/ndb/tools/waiter.cpp:
Auto merged
mysql-test/r/ndb_config.result:
manual merge
mysql-test/t/ndb_config.test:
manual merge
storage/ndb/include/util/InputStream.hpp:
manual merge
storage/ndb/tools/desc.cpp:
manual merge
storage/ndb/tools/ndb_condig.cpp:
manual merge
storage/ndb/tools/restore/restore_main.cpp:
manual merge
storage/ndb/tools/select_all.cpp:
manual merge
guess which scan type to use in handler
sql/ha_ndbcluster.cc:
Add guessing of scan type when starting full-table-scan
storage/ndb/include/ndbapi/NdbDictionary.hpp:
Add methods to check properties of a bitmap of columns
storage/ndb/include/ndbapi/NdbScanOperation.hpp:
Add DiskScanFlag
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Add aggregate of #disk columns
storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp:
Add #disk columns
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
Add disk scan flag
storage/ndb/tools/delete_all.cpp:
Add tupscan/diskscan to delete_all
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
storage/ndb/include/mgmapi/mgmapi.h:
Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
storage/ndb/src/mgmapi/mgmapi.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
Auto merged
storage/ndb/include/ndb_version.h.in:
merge
into bk-internal.mysql.com:/dev/shm/knielsen/mysql-5.1-new-ndb
client/mysqltest.c:
Auto merged
include/config-netware.h:
Auto merged
mysql-test/r/csv.result:
Auto merged
mysql-test/r/ctype_utf8.result:
Auto merged
mysql-test/r/func_time.result:
Auto merged
mysql-test/t/csv.test:
Auto merged
mysql-test/t/ctype_utf8.test:
Auto merged
mysql-test/t/func_time.test:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_view.cc:
Auto merged
sql/table.cc:
Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
storage/ndb/src/mgmapi/mgmapi.cpp:
Auto merged
storage/ndb/src/ndbapi/Ndb.cpp:
Auto merged
storage/ndb/src/ndbapi/ndberror.c:
Auto merged
storage/ndb/tools/ndb_condig.cpp:
Auto merged
tests/mysql_client_test.c:
Auto merged
storage/csv/ha_tina.cc:
manual merge.
storage/innobase/btr/btr0btr.c:
SCCS merged
storage/innobase/buf/buf0buf.c:
SCCS merged
storage/innobase/dict/dict0dict.c:
SCCS merged
storage/innobase/fil/fil0fil.c:
SCCS merged
storage/innobase/fsp/fsp0fsp.c:
SCCS merged
storage/innobase/handler/ha_innodb.cc:
SCCS merged
storage/innobase/include/btr0cur.ic:
use local
storage/innobase/include/buf0buf.ic:
SCCS merged
storage/innobase/log/log0log.c:
SCCS merged
storage/innobase/log/log0recv.c:
SCCS merged
storage/innobase/os/os0file.c:
SCCS merged
storage/innobase/row/row0mysql.c:
SCCS merged
storage/innobase/row/row0sel.c:
SCCS merged
storage/innobase/srv/srv0start.c:
SCCS merged
storage/innobase/ut/ut0dbg.c:
SCCS merged
crash for, e.g., NDB):
Submitting patch to base64_decode() adding extra parameter.
include/base64.h:
Adding parameter to base64_decode() to return the position just after
the string that was decoded.
mysys/base64.c:
Adding comment to base64_decode().
Adding parameter to base64_decode() to return the position just after
the string that was decoded.
sql/share/errmsg.txt:
Adding error message.
storage/ndb/src/mgmapi/mgmapi.cpp:
Parameters to base64_decode() changed.
unittest/mysys/base64-t.c:
Parameters to base64_decode() changed.
into dev3-76.dev.cn.tlan:/home/dli/mysql/mysql-5.1/mysql-5.1-bug-19651
storage/ndb/include/util/ndb_opts.h:
Auto merged
storage/ndb/test/ndbapi/flexScan.cpp:
Auto merged
storage/ndb/tools/ndb_condig.cpp:
Auto merged
storage/ndb/tools/restore/consumer.hpp:
merged for push bug#19651
storage/ndb/tools/restore/consumer_restore.cpp:
merged for push bug#19651
storage/ndb/tools/restore/consumer_restore.hpp:
merged for push bug#19651
storage/ndb/tools/restore/restore_main.cpp:
merged for push bug#19651
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
storage/ndb/include/kernel/GlobalSignalNumbers.h:
Auto merged
storage/ndb/include/ndbapi/NdbTransaction.hpp:
Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
storage/ndb/src/mgmapi/mgmapi.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbTransaction.cpp:
Auto merged
into perch.ndb.mysql.com:/home/jonas/src/51-work
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
storage/ndb/include/ndbapi/NdbDictionary.hpp:
compute aggregates only before create table or by user request.
remove distribution key hacks (set by user/set by us..)
storage/ndb/src/ndbapi/NdbDictionary.cpp:
compute aggregates only before create table or by user request.
remove distribution key hacks (set by user/set by us..)
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
compute aggregates only before create table or by user request.
remove distribution key hacks (set by user/set by us..)
storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp:
compute aggregates only before create table or by user request.
remove distribution key hacks (set by user/set by us..)
storage/ndb/test/include/NDBT_Table.hpp:
compute aggregates only before create table or by user request.
remove distribution key hacks (set by user/set by us..)
storage/ndb/test/src/NDBT_Tables.cpp:
compute aggregates only before create table or by user request.
remove distribution key hacks (set by user/set by us..)
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1
mysql-test/t/disabled.def:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/ha_ndbcluster_binlog.cc:
Auto merged
sql/ha_ndbcluster_binlog.h:
Auto merged
sql/sql_show.cc:
Auto merged
and other commands related to ndb. For all of these, the help screen contains
"Ndb.cfg" string. Now i change the "Ndb.cfg" to "my.cnf" because "Ndb.cfg" is obsolete.
storage/ndb/include/util/ndb_opts.h:
Change help information from including "Ndb.cfg" to "my.cnf" in the header file.
storage/ndb/test/ndbapi/flexScan.cpp:
Change help information from including "Ndb.cfg" to "my.cnf".
storage/ndb/tools/ndb_condig.cpp:
Change help information from including "Ndb.cfg" to "my.cnf".
into dev3-127.(none):/mnt/mysql/home/ngb/mysql-5.1/mysql-5.1-bug20575
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
Auto merged
storage/ndb/src/mgmclient/CommandInterpreter.cpp:
Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
Auto merged
into qa3-104.qa.cn.tlan:/mnt/sda7/justin.he/mysql/mysql-5.1/mysql-5.1-ndb-bj
storage/ndb/src/ndbapi/NdbOperation.cpp:
Auto merged
storage/ndb/src/ndbapi/ndberror.c:
change error message to more appropriate
into dev3-76.dev.cn.tlan:/home/dli/mysql/mysql-5.1/mysql-5.1-bug-20395
storage/ndb/include/kernel/signaldata/CmRegSignalData.hpp:
Auto merged
storage/ndb/include/ndb_version.h.in:
Auto merged
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
Auto merged
storage/ndb/src/kernel/error/ndbd_exit_codes.c:
Auto merged
storage/ndb/include/mgmapi/ndbd_exit_codes.h:
merge for bug#20395.
into dev3-138.dev.cn.tlan:/home/zhl/mysql/mysql-5.1/bug21799
sql/ha_ndbcluster.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_view.cc:
Auto merged
storage/ndb/src/mgmclient/CommandInterpreter.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
Auto merged
storage/ndb/src/ndbapi/ndberror.c:
Auto merged
"plug.in not included in dist source"
storage/archive/Makefile.am:
plug.in needs to be included in dist
storage/blackhole/Makefile.am:
plug.in needs to be included in dist
storage/csv/Makefile.am:
plug.in needs to be included in dist
storage/example/Makefile.am:
plug.in needs to be included in dist
storage/federated/Makefile.am:
plug.in needs to be included in dist
storage/heap/Makefile.am:
plug.in needs to be included in dist
storage/innobase/Makefile.am:
plug.in needs to be included in dist
storage/myisam/Makefile.am:
plug.in needs to be included in dist
storage/myisammrg/Makefile.am:
plug.in needs to be included in dist
storage/ndb/Makefile.am:
plug.in needs to be included in dist
into dev3-127.(none):/mnt/mysql/home/ngb/mysql-5.1/mysql-5.1-bug21530
storage/ndb/src/mgmclient/CommandInterpreter.cpp:
Adding exit error code for some methods
into perch.ndb.mysql.com:/home/jonas/src/51-work
storage/ndb/include/ndb_version.h.in:
Auto merged
storage/ndb/src/common/util/SocketClient.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
Auto merged
storage/ndb/include/kernel/GlobalSignalNumbers.h:
Auto merged
storage/ndb/include/mgmapi/mgmapi.h:
Auto merged
storage/ndb/include/mgmcommon/ConfigRetriever.hpp:
Auto merged
storage/ndb/include/util/SocketClient.hpp:
Auto merged
storage/ndb/src/common/mgmcommon/ConfigRetriever.cpp:
Auto merged
storage/ndb/src/common/transporter/Transporter.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Auto merged
storage/ndb/src/kernel/vm/Configuration.cpp:
Auto merged
storage/ndb/src/mgmapi/mgmapi.cpp:
Auto merged
storage/ndb/include/kernel/signaldata/CopyFrag.hpp:
merge
storage/ndb/src/common/debugger/signaldata/SignalNames.cpp:
merge
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
merge
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
merge
storage/ndb/src/kernel/blocks/dblqh/DblqhInit.cpp:
merge
into dev3-138.dev.cn.tlan:/home/zhl/mysql/mysql-5.1/bug19787
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
correct error message when illegal configuration changed
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
mysql-test/r/ndb_dd_basic.result:
Auto merged
mysql-test/r/ndb_dd_disk2memory.result:
Auto merged
BitKeeper/deleted/.del-ndb_dd_advance.result:
Auto merged
BitKeeper/deleted/.del-ndb_dd_advance2.result:
Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
allocate separate copy tuple for delete after insert or update in same tx, instead of sharing pointer to same copy tuple. this is an easy fix independent of commit/abort order of operations
mysql-test/r/ndb_dd_basic.result:
test INS-DEL via assert in disk data code
mysql-test/t/ndb_dd_basic.test:
test INS-DEL via assert in disk data code
into shellback.(none):/home/msvensson/mysql/mysql-5.1-new-maint
sql/ha_innodb.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/log.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_show.cc:
Auto merged
storage/csv/ha_tina.cc:
Auto merged
mysql-test/mysql-test-run.pl:
Merge
into ymer.(none):/usr/local/mysql/mysql-5.1-ndb-pbsu
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Auto merged
Temporary tables are not written to disk by DDL operations. This makes
DDL much faster (useful for tests), but tables are lost after system
restart.
New commit, since this feature will not be available in 5.1.
storage/ndb/include/kernel/signaldata/CreateIndx.hpp:
Add new error messages for temporary tables.
storage/ndb/include/kernel/signaldata/CreateTable.hpp:
Add new error messages for temporary tables.
storage/ndb/include/kernel/signaldata/DiAddTab.hpp:
Add parameter for making table temporary.
storage/ndb/include/kernel/signaldata/DictTabInfo.hpp:
Add parameter for making table temporary.
storage/ndb/include/kernel/signaldata/ListTables.hpp:
Add parameter for making table temporary.
storage/ndb/include/ndb_constants.h:
Add parameter for making table temporary.
storage/ndb/include/ndbapi/NdbDictionary.hpp:
Add parameter for making table temporary.
storage/ndb/src/common/debugger/signaldata/DictTabInfo.cpp:
Add parameter for making table temporary.
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Implement temporary tables.
storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
Implement temporary tables.
storage/ndb/src/kernel/blocks/dbdict/SchemaFile.hpp:
Implement temporary tables.
storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
Implement temporary tables.
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Implement temporary tables.
storage/ndb/src/ndbapi/NdbDictionary.cpp:
Implement temporary tables.
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Implement temporary tables.
storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp:
Implement temporary tables.
storage/ndb/src/ndbapi/ndberror.c:
Add new error messages for temporary tables.
storage/ndb/tools/listTables.cpp:
Add display of table and index temporary status.
into dev3-138.dev.cn.tlan:/home/zhl/mysql/mysql-5.1/bug21128
storage/ndb/include/mgmapi/mgmapi.h:
Auto merged
storage/ndb/src/mgmapi/mgmapi.cpp:
Auto merged
storage/ndb/src/mgmsrv/Services.cpp:
Auto merged
storage/ndb/src/mgmsrv/Services.hpp:
Auto merged
storage/ndb/test/ndbapi/test_event_merge.cpp:
minor
storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
1. fix list size info to account for blobs and merges so that cleanups and reports trigger as intended
2. remove big poorly-local loop from free_list which affected also non-blob tables (1. was needed for this)
storage/ndb/src/ndbapi/NdbEventOperationImpl.hpp:
1. fix list size info to account for blobs and merges so that cleanups and reports trigger as intended
2. remove big poorly-local loop from free_list which affected also non-blob tables (1. was needed for this)
fix ndb-violations of strict aliasing found by gcc4.1
(crashes in ndb_dd_*)
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Fix strict-aliasing
storage/ndb/src/kernel/vm/KeyTable2Ref.hpp:
Fix strict-aliasing
storage/ndb/src/kernel/vm/Pool.hpp:
Fix strict-aliasing
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
sql/ha_ndbcluster.cc:
Auto merged
sql/ha_ndbcluster_binlog.cc:
Auto merged
storage/ndb/include/ndbapi/NdbTransaction.hpp:
Auto merged
storage/ndb/src/mgmapi/mgmapi.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbEventOperationImpl.hpp:
Auto merged
storage/ndb/src/ndbapi/ndb_cluster_connection.cpp:
Auto merged
mysql-test/mysql-test-run.pl:
Merge
storage/ndb/include/ndbapi/ndb_cluster_connection.hpp:
Merge
into dev3-76.dev.cn.tlan:/home/dli/mysql/mysql-5.1/mysql-5.1-bug-21345
BitKeeper/deleted/.del-bug20328.result~4fee68989442c2a3:
Auto merged
BitKeeper/deleted/.del-bug20328.test~c76d766fe3e1eb5:
Auto merged
mysql-test/r/ctype_utf8.result:
Auto merged
mysql-test/t/ctype_utf8.test:
Auto merged
storage/myisam/mi_unique.c:
Auto merged
storage/ndb/include/util/File.hpp:
Auto merged
storage/ndb/src/common/logger/FileLogHandler.cpp:
Auto merged
storage/ndb/src/common/util/File.cpp:
Auto merged
strings/ctype-win1250ch.c:
Auto merged
storage/ndb/src/ndbapi/Ndb.cpp:
Ndb.closeTransaction() modifies the value of Ndb.theError.code,
but the error code shouldn't be changed here.
Mysqld will use the returning error code to log the correct information.
into dev3-127.(none):/mnt/mysql/home/ngb/mysql-5.1-bug19873
include/config-netware.h:
Auto merged
mysql-test/r/func_time.result:
Auto merged
mysql-test/t/func_time.test:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_view.cc:
Auto merged
storage/innobase/btr/btr0btr.c:
Auto merged
storage/innobase/buf/buf0buf.c:
Auto merged
storage/innobase/dict/dict0dict.c:
Auto merged
storage/innobase/fil/fil0fil.c:
Auto merged
storage/innobase/fsp/fsp0fsp.c:
Auto merged
storage/innobase/include/buf0buf.ic:
Auto merged
storage/innobase/log/log0log.c:
Auto merged
storage/innobase/log/log0recv.c:
Auto merged
storage/innobase/os/os0file.c:
Auto merged
storage/innobase/row/row0sel.c:
Auto merged
storage/innobase/srv/srv0start.c:
Auto merged
storage/innobase/ut/ut0dbg.c:
Auto merged
storage/ndb/src/mgmclient/CommandInterpreter.cpp:
Auto merged
storage/ndb/src/ndbapi/ndberror.c:
Auto merged
tests/mysql_client_test.c:
Auto merged
into dev3-127.(none):/mnt/mysql/home/ngb/mysql-5.1-ndb-bj
sql/ha_ndbcluster.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_view.cc:
Auto merged
sql/table.cc:
Auto merged
storage/ndb/src/mgmclient/CommandInterpreter.cpp:
Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
Auto merged
storage/ndb/src/ndbapi/ndberror.c:
Auto merged
into zim.(none):/home/brian/mysql/arch-5.1
BUILD/compile-alpha-cxx:
Auto merged
BUILD/compile-alpha-debug:
Auto merged
BUILD/compile-dist:
Auto merged
BUILD/compile-ia64-debug-max:
Auto merged
CMakeLists.txt:
Auto merged
client/mysql.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_plugin.cc:
Auto merged
storage/csv/ha_tina.cc:
Auto merged
BUILD/FINISH.sh:
Innodbase config still needed.
affects basically all replication tests
storage/ndb/include/kernel/signaldata/SumaImpl.hpp:
Fix signal data class SubTableData not to use Uint8 which can result in incorrect packing
storage/ndb/src/common/debugger/signaldata/SumaImpl.cpp:
Fix signal data class SubTableData not to use Uint8 which can result in incorrect packing
storage/ndb/src/kernel/blocks/suma/Suma.cpp:
1) Fix signal data class SubTableData not to use Uint8 which can result in incorrect packing
2) make sure to set NdbdNodeId on _TE_STOP
storage/ndb/src/ndbapi/NdbBlob.cpp:
Fix signal data class SubTableData not to use Uint8 which can result in incorrect packing
storage/ndb/src/ndbapi/NdbEventOperation.cpp:
Fix signal data class SubTableData not to use Uint8 which can result in incorrect packing
storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
Fix signal data class SubTableData not to use Uint8 which can result in incorrect packing
storage/ndb/src/ndbapi/NdbEventOperationImpl.hpp:
Fix signal data class SubTableData not to use Uint8 which can result in incorrect packing
storage/ndb/src/ndbapi/Ndbif.cpp:
Fix signal data class SubTableData not to use Uint8 which can result in incorrect packing
Fix so that expand_check2 is only run per fragment,
as restore now works 1 fragment at a time (again)
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Fix so that expand_check2 is only run per fragment,
as restore now works 1 fragment at a time (again)
Deleted config/ac-macros/ha_berkeley.m4
Removed more referenses to bdb
BitKeeper/deleted/.del-ha_berkeley.m4:
Delete: config/ac-macros/ha_berkeley.m4
BUILD/FINISH.sh:
Removed more referenses to bdb
BUILD/compile-alpha-cxx:
Removed more referenses to bdb
BUILD/compile-alpha-debug:
Removed more referenses to bdb
BUILD/compile-dist:
Removed more referenses to bdb
BUILD/compile-ia64-debug-max:
Removed more referenses to bdb
CMakeLists.txt:
Removed more referenses to bdb
Makefile.am:
Removed more referenses to bdb
libmysqld/lib_sql.cc:
Removed more referenses to bdb
sql/mysql_priv.h:
Removed more referenses to bdb
storage/ndb/config/win-prg.am:
Removed more referenses to bdb
storage/ndb/test/run-test/ndb-autotest.sh:
Removed more referenses to bdb
support-files/my-huge.cnf.sh:
Removed more referenses to bdb
support-files/my-large.cnf.sh:
Removed more referenses to bdb
support-files/my-medium.cnf.sh:
Removed more referenses to bdb
fix bug in drop_file during pageout (LCP)
storage/ndb/src/kernel/blocks/pgman.cpp:
1) Allow Page_entry::REQUEST, when dropping page (in drop_file path)
2) Do all IO JBA
3) Handle PAGEOUT during drop_file (caused by LCP)
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
mysql-test/r/ndb_lock.result:
Auto merged
mysql-test/t/ndb_lock.test:
Auto merged
sql/ha_ndbcluster.h:
Auto merged
storage/ndb/include/ndbapi/NdbTransaction.hpp:
Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
mysql-test/t/disabled.def:
SCCS merged
sql/ha_ndbcluster.cc:
e
merge
Fix bug in lcp during drop table
Make sure that file thread is not started until meta data has completed
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
Fix bug in lcp during drop table
Make sure that file thread is not started until meta data has completed
storage/ndb/src/kernel/blocks/backup/Backup.hpp:
Fix bug in lcp during drop table
Make sure that file thread is not started until meta data has completed
storage/ndb/src/kernel/blocks/backup/FsBuffer.hpp:
Fix bug in lcp during drop table
Make sure that file thread is not started until meta data has completed
into dev3-127.(none):/mnt/mysql/home/ngb/mysql-5.1-bug19620
sql/sql_base.cc:
Auto merged
sql/sql_view.cc:
Auto merged
storage/ndb/src/mgmclient/CommandInterpreter.cpp:
Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
Auto merged
into dev3-138.dev.cn.tlan:/home/zhl/mysql/mysql-5.1/bug21052
sql/ha_ndbcluster.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_view.cc:
Auto merged
storage/ndb/src/mgmclient/CommandInterpreter.cpp:
Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
Auto merged
into willster.(none):/home/stewart/Documents/MySQL/5.1/ndb
storage/ndb/src/mgmapi/mgmapi.cpp:
Auto merged
storage/ndb/src/mgmclient/CommandInterpreter.cpp:
Auto merged
into dev3-127.(none):/mnt/mysql/home/ngb/mysql-5.1-bug19620
storage/ndb/src/mgmclient/CommandInterpreter.cpp:
Delete the codes related to HAVE_GLOBAL_REPLICATION macro
into dev3-138.dev.cn.tlan:/home/zhl/mysql/mysql-5.1/bug21052
storage/ndb/src/mgmclient/CommandInterpreter.cpp:
Auto merged
storage/ndb/src/mgmsrv/Services.cpp:
Auto merged
storage/ndb/src/ndbapi/ndberror.c:
Manual merged
into dev3-138.dev.cn.tlan:/home/zhl/mysql/mysql-5.1/mysql-5.1-ndb-bj
sql/sql_base.cc:
Auto merged
sql/sql_view.cc:
Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
Auto merged
into dev3-76.dev.cn.tlan:/home/lisj/mysql/mysql-5.1/mysql-5.1-bug19047
storage/ndb/src/mgmclient/CommandInterpreter.cpp:
Auto merged
storage/ndb/src/mgmclient/main.cpp:
Auto merged
storage/ndb/src/mgmclient/ndb_mgmclient.hpp:
Auto merged
into dev3-76.dev.cn.tlan:/home/lisj/mysql/mysql-5.1/mysql-5.1-ndb-bj
sql/sql_base.cc:
Auto merged
sql/sql_view.cc:
Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
Auto merged
Fix build failure if O_DIRECT is not defined
Fix stack overflow by making odirect_readbuf global
Remove soem old debug variables
storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp:
Fix build failure if O_DIRECT is not defined
Fix stack overflow by making odirect_readbuf global
Remove soem old debug variables
storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp:
Fix build failure if O_DIRECT is not defined
Fix stack overflow by making odirect_readbuf global
Remove soem old debug variables
into willster.(none):/home/stewart/Documents/MySQL/5.1/ndb
mysql-test/t/disabled.def:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/ha_ndbcluster_binlog.cc:
Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
Auto merged
into perch.ndb.mysql.com:/home/jonas/src/51-work
storage/ndb/include/ndbapi/NdbOperation.hpp:
Auto merged
storage/ndb/src/kernel/blocks/ERROR_codes.txt:
Auto merged
storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupPagMan.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupPageMap.cpp:
Auto merged
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
Auto merged
storage/ndb/src/mgmapi/ndb_logevent.cpp:
Auto merged
storage/ndb/test/ndbapi/testIndex.cpp:
Auto merged
storage/ndb/test/ndbapi/testSystemRestart.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
merge
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
merge
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
merge
storage/ndb/test/run-test/daily-basic-tests.txt:
merge
into bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
BitKeeper/etc/ignore:
auto-union
BitKeeper/deleted/.del-im_options_set.result~59278f56be61d921:
Auto merged
BitKeeper/deleted/.del-mysqld.dsp~ffdbf2d234e23e56:
Auto merged
BitKeeper/deleted/.del-mysys.dsp~32695fee91189326:
Auto merged
BitKeeper/deleted/.del-im_options_set.imtest~b53d9d60e5684833:
Auto merged
BitKeeper/deleted/.del-im_options_unset.imtest~768eb186b51d0048:
Auto merged
BitKeeper/deleted/.del-im_options_unset.result~20a4790cd3c70a4f:
Auto merged
client/mysql.cc:
Auto merged
client/mysqlbinlog.cc:
Auto merged
client/mysqlcheck.c:
Auto merged
client/mysqldump.c:
Auto merged
client/mysqltest.c:
Auto merged
dbug/dbug.c:
Auto merged
extra/perror.c:
Auto merged
extra/yassl/src/yassl_imp.cpp:
Auto merged
extra/yassl/src/yassl_int.cpp:
Auto merged
include/mysql.h:
Auto merged
include/mysql_com.h:
Auto merged
libmysql/libmysql.c:
Auto merged
mysql-test/r/cast.result:
Auto merged
mysql-test/r/date_formats.result:
Auto merged
mysql-test/r/federated.result:
Auto merged
mysql-test/r/func_compress.result:
Auto merged
mysql-test/r/func_group.result:
Auto merged
mysql-test/r/func_time.result:
Auto merged
mysql-test/r/gis-rtree.result:
Auto merged
mysql-test/r/gis.result:
Auto merged
mysql-test/r/im_daemon_life_cycle.result:
Auto merged
mysql-test/r/im_utils.result:
Auto merged
mysql-test/r/join_outer.result:
Auto merged
mysql-test/r/mysqlcheck.result:
Auto merged
mysql-test/r/rpl_sp.result:
Auto merged
mysql-test/r/rpl_trigger.result:
Auto merged
mysql-test/r/sp-code.result:
Auto merged
mysql-test/r/sp-security.result:
Auto merged
mysql-test/r/strict.result:
Auto merged
mysql-test/r/type_blob.result:
Auto merged
mysql-test/r/type_datetime.result:
Auto merged
mysql-test/r/type_ranges.result:
Auto merged
mysql-test/r/udf.result:
Auto merged
mysql-test/r/user_var.result:
Auto merged
mysql-test/t/cast.test:
Auto merged
mysql-test/t/disabled.def:
Auto merged
mysql-test/t/func_group.test:
Auto merged
mysql-test/t/func_time.test:
Auto merged
mysql-test/t/im_daemon_life_cycle.imtest:
Auto merged
mysql-test/t/im_life_cycle.imtest:
Auto merged
mysql-test/t/im_utils.imtest:
Auto merged
mysql-test/t/mysql.test:
Auto merged
mysql-test/t/mysqlbinlog.test:
Auto merged
mysql-test/t/mysqlcheck.test:
Auto merged
mysql-test/t/ps.test:
Auto merged
mysql-test/t/rpl_trigger.test:
Auto merged
mysql-test/t/sp-security.test:
Auto merged
mysql-test/t/strict.test:
Auto merged
mysql-test/t/udf.test:
Auto merged
sql/field.cc:
Auto merged
sql/item.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_func.h:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/item_strfunc.h:
Auto merged
sql/item_subselect.cc:
Auto merged
sql/item_sum.h:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/protocol.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sp.cc:
Auto merged
sql/sp_head.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_udf.cc:
Auto merged
sql/sql_view.cc:
Auto merged
sql/table.cc:
Auto merged
sql-common/client.c:
Auto merged
sql-common/my_time.c:
Auto merged
sql/table.h:
Auto merged
storage/ndb/src/kernel/error/ndbd_exit_codes.c:
Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
Auto merged
mysql-test/r/im_life_cycle.result:
e
use local
mysql-test/r/ps.result:
use local
client/Makefile.am:
Manual merge.
client/mysqlimport.c:
Manual merge.
configure.in:
Manual merge.
mysql-test/mysql-test-run.pl:
Manual merge.
mysql-test/r/mysqldump.result:
Manual merge.
mysql-test/r/mysqltest.result:
Manual merge.
mysql-test/r/ndb_basic.result:
Manual merge.
mysql-test/r/rpl_view.result:
Manual merge.
mysql-test/r/show_check.result:
Manual merge.
mysql-test/r/sp-error.result:
Manual merge.
mysql-test/r/sp.result:
Manual merge.
mysql-test/r/union.result:
Manual merge.
mysql-test/t/mysqldump.test:
Manual merge.
mysql-test/t/mysqltest.test:
Manual merge.
mysql-test/t/ndb_basic.test:
Manual merge.
mysql-test/t/rpl_sp.test:
Manual merge.
mysql-test/t/rpl_view.test:
Manual merge.
mysql-test/t/show_check.test:
Manual merge.
mysql-test/t/sp-error.test:
Manual merge.
mysql-test/t/sp.test:
Manual merge.
sql/item_sum.cc:
Manual merge.
sql/mysql_priv.h:
Manual merge.
sql/sp_head.cc:
Manual merge.
sql/sql_db.cc:
Manual merge.
sql/sql_delete.cc:
Manual merge.
sql/sql_lex.h:
Manual merge.
sql/sql_show.cc:
Manual merge.
sql/sql_table.cc:
Manual merge.
sql/sql_trigger.cc:
Manual merge.
sql/sql_yacc.yy:
Manual merge.
tests/mysql_client_test.c:
Manual merge.
into mysql.com:/home/marty/MySQL/mysql-5.1-ndb
mysql-test/r/ndb_read_multi_range.result:
Auto merged
mysql-test/t/ndb_lock.test:
Auto merged
mysql-test/t/ndb_read_multi_range.test:
Auto merged
storage/ndb/include/ndbapi/NdbTransaction.hpp:
Auto merged
mysql-test/r/ndb_lock.result:
Merge (using local)
sql/ha_ndbcluster.cc:
Merge fix for bug #18184 SELECT ... FOR UPDATE does not work..
sql/ha_ndbcluster.h:
Merge fix for bug #18184 SELECT ... FOR UPDATE does not work..
Add extra sleeps (conditionally) if user-ndb-object still exists during shutdown
Note: This is not in anyway optimal, but i dont't really know in which order should be shutdown
but it fixes problem...
sql/ha_ndbcluster_binlog.cc:
Add extra wait loop to make user "user" ndb-object go away...
otherwise user thread can have ongoing SUB_DATA
storage/ndb/include/ndbapi/ndb_cluster_connection.hpp:
Add interface for getting active ndb-object count
storage/ndb/src/ndbapi/Ndbif.cpp:
Add return in case of incorrect magic
storage/ndb/src/ndbapi/TransporterFacade.cpp:
Add interface for getting active ndb-object count
storage/ndb/src/ndbapi/ndb_cluster_connection.cpp:
Add interface for getting active ndb-object count
make fragment logpart in DIH "global"
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Store logpart id in FRAGMENTATION as it goes very bad if
they differ on different nodes, as they are copied from master
on node/system -restart
make each fragment use own LCP file, so that (s/n)r can use different LCP-no for different fragments
storage/ndb/include/kernel/signaldata/FsOpenReq.hpp:
Add fragment id to LCP filename
storage/ndb/src/kernel/blocks/ERROR_codes.txt:
Add new error code
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
put each fragment in own LCP file
storage/ndb/src/kernel/blocks/backup/Backup.hpp:
put each fragment in own LCP file
storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
Use fifo lists
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
1) use fifo lists
2) restore each fragment separatly
3) add error codes
storage/ndb/src/kernel/blocks/restore.cpp:
Add fragment id to LCP filename
storage/ndb/src/kernel/blocks/ndbfs/Filename.cpp:
Add fragment id to LCP filename
storage/ndb/test/ndbapi/testNodeRestart.cpp:
Add testcase
storage/ndb/test/run-test/daily-basic-tests.txt:
add testcase
make dump state args list const
make node lists const
storage/ndb/include/mgmapi/mgmapi_debug.h:
make dump state args list const
storage/ndb/src/mgmapi/mgmapi.cpp:
make dump state args list const
storage/ndb/test/include/NdbRestarter.hpp:
make node lists const
storage/ndb/test/src/NdbRestarter.cpp:
make node lists const
report only once on "all dump 1000"
storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
report DM only once
storage/ndb/src/kernel/blocks/dbtup/DbtupDebug.cpp:
report DM only once
make Dblqh use OM_AUTO_SYNC
storage/ndb/include/kernel/signaldata/FsOpenReq.hpp:
make Dblqh us OM_AUTO_SYNC
storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
make Dblqh us OM_AUTO_SYNC
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
make Dblqh us OM_AUTO_SYNC
storage/ndb/src/kernel/vm/pc.hpp:
remove unused #defines
3 new paramters:
DiskSyncSize - Outstanding disk writes before sync (default 4M)
DiskCheckpointSpeed - Write speed of LCP in bytes/sec (default 10M)
DiskCheckpointSpeedInRestart - As above but during LCP (default 100M)
Depricated old NoOfDiskPagesToDisk*
- Change NoOfFragmentLogFiles default to 16 (1Gb)
storage/ndb/include/kernel/signaldata/BackupContinueB.hpp:
Add possibility to limitat of disk write speed in backup
storage/ndb/include/mgmapi/mgmapi_config_parameters.h:
Add possibility to limitat of disk write speed in backup
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
Add possibility to limitat of disk write speed in backup
storage/ndb/src/kernel/blocks/backup/Backup.hpp:
Add possibility to limitat of disk write speed in backup
storage/ndb/src/kernel/blocks/backup/BackupInit.cpp:
Add possibility to limitat of disk write speed in backup
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
Add possibility to limitat of disk write speed in backup
Change NoOfFragmentLogFiles default to 16 (1Gb)
DiskSyncSize
DiskCheckpointSpeed
DiskCheckpointSpeedInRestart
storage/ndb/src/mgmsrv/InitConfigFileParser.cpp:
Handle deprication warning also in my.cnf format
add sync-flag to FsAppendReq
storage/ndb/include/kernel/signaldata/FsAppendReq.hpp:
Add sync flag to FsAppend
storage/ndb/include/kernel/signaldata/FsOpenReq.hpp:
Add auto sync flag to FSOPEN
storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp:
Add append_synch and auto sync
storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.hpp:
Add variables for auto sync
storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp:
Add append_sync and auto sync
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
Auto merged
into perch.ndb.mysql.com:/home/jonas/src/51-work
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
Auto merged
storage/ndb/test/include/HugoTransactions.hpp:
Auto merged
storage/ndb/test/src/HugoTransactions.cpp:
Auto merged
storage/ndb/test/include/HugoTransactions.hpp:
Add abort flag to hugoLoad
storage/ndb/test/src/HugoTransactions.cpp:
Add abort flag to hugoLoad
storage/ndb/test/tools/hugoLoad.cpp:
Add abort flag to hugoLoad
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
Auto merged
into sunlight.local:/local_work/tmp_merge-5.1-opt-mysql
client/mysql.cc:
Auto merged
mysql-test/r/date_formats.result:
Auto merged
mysql-test/r/func_gconcat.result:
Auto merged
mysql-test/r/func_group.result:
Auto merged
mysql-test/r/func_str.result:
Auto merged
mysql-test/r/group_min_max.result:
Auto merged
BitKeeper/deleted/.del-make_win_src_distribution.sh~f80d8fca44e4e5f1:
Auto merged
BitKeeper/deleted/.del-mysqld.dsp~ffdbf2d234e23e56:
Auto merged
BitKeeper/deleted/.del-mysqld_ia64.dsp~7f8cf84d81ee04e2:
Auto merged
BitKeeper/deleted/.del-mysqldump.dsp~a8bd23547d3fc27e:
Auto merged
BitKeeper/deleted/.del-mysqldump_ia64.dsp~a2aabe898be35b31:
Auto merged
mysql-test/r/innodb.result:
Auto merged
mysql-test/r/innodb_mysql.result:
Auto merged
mysql-test/r/ps_7ndb.result:
Auto merged
mysql-test/r/type_ranges.result:
Auto merged
mysql-test/r/udf.result:
Auto merged
mysql-test/r/union.result:
Auto merged
mysql-test/r/view.result:
Auto merged
mysql-test/t/date_formats.test:
Auto merged
mysql-test/t/func_gconcat.test:
Auto merged
mysql-test/t/func_group.test:
Auto merged
mysql-test/t/group_min_max.test:
Auto merged
mysql-test/t/innodb.test:
Auto merged
mysql-test/t/innodb_mysql.test:
Auto merged
mysql-test/t/mysql.test:
Auto merged
mysql-test/t/select.test:
Auto merged
mysql-test/t/sp.test:
Auto merged
mysql-test/t/view.test:
Auto merged
sql/field.cc:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_func.h:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/item_subselect.cc:
Auto merged
sql/item_subselect.h:
Auto merged
sql/opt_range.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/time.cc:
Auto merged
storage/ndb/test/ndbapi/Makefile.am:
Auto merged
strings/decimal.c:
Auto merged
mysql-test/r/analyse.result:
Manual merge
mysql-test/r/bigint.result:
Manual merge
mysql-test/r/create.result:
Manual merge
mysql-test/r/information_schema.result:
Manual merge
mysql-test/r/ps_2myisam.result:
Manual merge
mysql-test/r/ps_3innodb.result:
Manual merge
mysql-test/r/ps_4heap.result:
Manual merge
mysql-test/r/ps_5merge.result:
Manual merge
mysql-test/r/ps_6bdb.result:
Manual merge
mysql-test/r/rpl_insert_id.result:
Manual merge
mysql-test/r/select.result:
Manual merge
mysql-test/r/sp.result:
Manual merge
mysql-test/r/subselect.result:
Manual merge
mysql-test/t/information_schema.test:
Manual merge
mysql-test/t/rpl_insert_id.test:
Manual merge
sql/field.h:
Manual merge
sql/item.cc:
Manual merge
sql/item.h:
Manual merge
sql/item_strfunc.h:
Manual merge
sql/item_sum.cc:
Manual merge
sql/mysql_priv.h:
Manual merge
sql/share/errmsg.txt:
Manual merge
sql/sql_class.h:
Manual merge
sql/sql_select.cc:
Manual merge
into orca.ndb.mysql.com:/space_old/pekka/ndb/version/my51-bug14935
storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
Auto merged
storage/ndb/src/kernel/blocks/ERROR_codes.txt:
manual
into willster.(none):/home/stewart/Documents/MySQL/5.1/main
BitKeeper/etc/config:
Auto merged
sql/opt_range.cc:
Auto merged
storage/ndb/src/kernel/blocks/ERROR_codes.txt:
Auto merged
storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupTabDesMan.cpp:
Auto merged
storage/ndb/test/ndbapi/testDict.cpp:
Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
Auto merged
mysql-test/Makefile.am:
manual merge
storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
manual merge
storage/ndb/src/kernel/blocks/ERROR_codes.txt:
if TUX update fails, need to abort op on tuple (5.1 specific)
storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
if TUX update fails, need to abort op on tuple (5.1 specific)
storage/ndb/src/kernel/blocks/dbtup/DbtupAbort.cpp:
if TUX update fails, need to abort op on tuple (5.1 specific)
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
if TUX update fails, need to abort op on tuple (5.1 specific)
storage/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp:
if TUX update fails, need to abort op on tuple (5.1 specific)
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
mysql-test/r/partition.result:
Auto merged
mysql-test/t/partition.test:
Auto merged
sql/unireg.cc:
Auto merged
BitKeeper/deleted/.del-partition_innodb.result:
Auto merged
BitKeeper/deleted/.del-partition_innodb.test:
Auto merged
into siva.hindu.god:/usr/home/tim/m/bk/merge-51
(which is mysql-5.1-new-maint team tree)
include/my_base.h:
Auto merged
mysql-test/extra/rpl_tests/rpl_loaddata.test:
Auto merged
mysql-test/lib/mtr_cases.pl:
Auto merged
mysql-test/r/rpl_loaddata.result:
Auto merged
mysql-test/r/sp-security.result:
Auto merged
mysql-test/t/sp-security.test:
Auto merged
mysql-test/lib/mtr_report.pl:
merge of mysql-5.1 -> mysql-5.1-new-maint
mysql-test/mysql-test-run.pl:
merge of mysql-5.1 -> mysql-5.1-new-maint
into bodhi.local:/opt/local/work/mysql-5.1-runtime-merge-5.0
include/my_sys.h:
Auto merged
mysql-test/r/auto_increment.result:
Auto merged
mysql-test/r/func_math.result:
Auto merged
mysql-test/r/func_system.result:
Auto merged
mysql-test/r/func_time.result:
Auto merged
mysql-test/r/information_schema.result:
Auto merged
mysql-test/r/query_cache.result:
Auto merged
mysql-test/r/subselect.result:
Auto merged
mysql-test/r/trigger.result:
Auto merged
mysql-test/r/type_blob.result:
Auto merged
mysql-test/r/variables.result:
Auto merged
mysql-test/r/view.result:
Auto merged
mysql-test/t/trigger.test:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/log.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_trigger.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
Auto merged
sql/slave.h:
SCCS merged
mysql-test/r/show_check.result:
Manual merge.
mysql-test/t/show_check.test:
Manual merge.
sql/log_event.cc:
Manual merge.
sql/share/errmsg.txt:
Manual merge.
sql/sql_class.h:
Manual merge.
sql/sql_db.cc:
Manual merge.
into zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1-new-maint
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/create.result:
Auto merged
mysql-test/r/ps.result:
Auto merged
mysql-test/r/sp.result:
Auto merged
mysql-test/t/create.test:
Auto merged
mysql-test/t/ndb_autodiscover3.test:
Auto merged
mysql-test/t/ps.test:
Auto merged
mysql-test/t/sp.test:
Auto merged
mysql-test/t/wait_timeout.test:
Auto merged
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
into orca.ndb.mysql.com:/space_old/pekka/ndb/version/my51-bug18781
storage/ndb/include/kernel/GlobalSignalNumbers.h:
auto
storage/ndb/src/common/debugger/signaldata/SignalNames.cpp:
SCCS merged
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
auto
storage/ndb/src/kernel/vm/SimulatedBlock.cpp:
auto
storage/ndb/src/kernel/vm/SimulatedBlock.hpp:
manual
- keep accounting for aoutstanding drop trigger requests
- also lock table object in suma while doing that (should be impossible right now though since dict serializes all requests)
into perch.ndb.mysql.com:/home/jonas/src/51-work
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
SCCS merged
Add DynArr256 which is a ndb-ish judy array
Like the one used in ACC
storage/ndb/src/kernel/vm/Makefile.am:
Add DynArr256
storage/ndb/src/kernel/vm/bench_pool.cpp:
update benchpool program
storage/ndb/src/kernel/vm/DynArr256.cpp:
New BitKeeper file ``storage/ndb/src/kernel/vm/DynArr256.cpp''
storage/ndb/src/kernel/vm/DynArr256.hpp:
New BitKeeper file ``storage/ndb/src/kernel/vm/DynArr256.hpp''
- flush gci needs to be reset on disconnect as cluster may reconnect after --initial with a smaller gci
storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
Bug #20843 tests fails randomly with assertion in completeClusterFailed
reenabled test
into zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1-new-maint
BUILD/compile-dist:
Auto merged
BitKeeper/deleted/.del-partition_innodb.result:
Auto merged
BitKeeper/deleted/.del-partition_innodb.test:
Auto merged
client/mysqltest.c:
Auto merged
mysql-test/r/create.result:
Auto merged
mysql-test/r/create_not_windows.result:
Auto merged
mysql-test/r/func_group.result:
Auto merged
mysql-test/r/innodb_mysql.result:
Auto merged
mysql-test/r/partition.result:
Auto merged
mysql-test/r/sp.result:
Auto merged
mysql-test/t/innodb_mysql.test:
Auto merged
mysql-test/t/partition.test:
Auto merged
mysql-test/t/ps_1general.test:
Auto merged
mysql-test/t/sp.test:
Auto merged
mysql-test/t/wait_timeout.test:
Auto merged
mysys/my_lib.c:
Auto merged
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/unireg.cc:
Auto merged
mysql-test/extra/rpl_tests/rpl_log.test:
manuakl merge
mysql-test/lib/mtr_process.pl:
manuakl merge
mysql-test/mysql-test-run.pl:
manuakl merge
mysql-test/r/type_newdecimal.result:
manuakl merge
mysql-test/t/create.test:
manuakl merge
mysql-test/t/func_group.test:
manuakl merge
mysql-test/t/type_newdecimal.test:
manuakl merge
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-ndb
storage/ndb/include/mgmapi/ndbd_exit_codes.h:
Auto merged
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
Auto merged
storage/ndb/src/kernel/error/ndbd_exit_codes.c:
Auto merged
corrected error in invalidation of dict cache which may be causing the valgrind warning at times
sql/ha_ndbcluster_binlog.cc:
extra logging and asserts to try to track down the spurious completeCluster failure assetion
storage/ndb/src/ndbapi/DictCache.cpp:
corrected error in invalidation of dict cache which may be causing the valgrind warning at times
storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
extra logging and asserts to try to track down the spurious completeCluster failure assetion
storage/ndb/src/ndbapi/NdbEventOperationImpl.hpp:
extra logging and asserts to try to track down the spurious completeCluster failure assetion
storage/ndb/test/ndbapi/test_event_merge.cpp:
cannot skip tables if ops specified
storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
report even composite op in merge
test case: test_event_merge --no-blobs --ops ic:dcic
into perch.ndb.mysql.com:/home/jonas/src/51-work
storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
merge
