fix not aligned or non 32-bit values in "smart" scan
mysql-test/r/ndb_partition_key.result:
testcase
mysql-test/t/ndb_partition_key.test:
ndb - bug
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
Fix unaligned or non-32-bit values in "smart scan"
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/qmgr/QmgrMain.cpp:
Auto merged
storage/ndb/test/ndbapi/testNodeRestart.cpp:
merge
storage/ndb/test/run-test/daily-basic-tests.txt:
merge
fix bug when master failure during nr
(recommit against 5.0)
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
recommit against 5.0
ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
recommit against 5.0
ndb/test/ndbapi/testNodeRestart.cpp:
recommit against 5.0
ndb/test/run-test/daily-basic-tests.txt:
recommit against 5.0
extra sledge hammer, (real 51)
use dicklock to prevent SUB_START_REQ during node recovery
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
use dicklock to prevent SUB_START_REQ during node recovery
storage/ndb/include/kernel/GlobalSignalNumbers.h:
add extra version info to main clone
storage/ndb/include/kernel/NodeInfo.hpp:
add extra version info to main clone
storage/ndb/include/kernel/signaldata/ApiRegSignalData.hpp:
add extra version info to main clone
storage/ndb/include/ndb_version.h.in:
add extra version info to main clone
storage/ndb/src/common/debugger/signaldata/SignalNames.cpp:
add extra version info to main clone
storage/ndb/src/kernel/blocks/qmgr/Qmgr.hpp:
add extra version info to main clone
storage/ndb/src/kernel/blocks/qmgr/QmgrInit.cpp:
add extra version info to main clone
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
add extra version info to main clone
storage/ndb/src/kernel/vm/GlobalData.hpp:
add extra version info to main clone
storage/ndb/src/kernel/vm/SimulatedBlock.hpp:
add extra version info to main clone
Fix most obvious error in dict/suma error handling of events
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Fix most obvious error in dict/suma error handling of events
storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
Fix most obvious error in dict/suma error handling of events
storage/ndb/src/kernel/blocks/suma/Suma.cpp:
Fix most obvious error in dict/suma error handling of events
storage/ndb/src/kernel/blocks/suma/SumaInit.cpp:
Fix most obvious error in dict/suma error handling of events
on master node failure during qmgr-commitreq
make sure to remove all committed failed nodes from failed/prepfailed arrays
ndb/include/kernel/signaldata/DumpStateOrd.hpp:
new error code
ndb/src/kernel/blocks/ERROR_codes.txt:
new error code
ndb/src/kernel/blocks/qmgr/Qmgr.hpp:
extra error insert variable
ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
make sure to remove all committed failed nodes from failed/prepfailed arrays
ndb/test/ndbapi/testNodeRestart.cpp:
testcase
ndb/test/run-test/daily-basic-tests.txt:
testcase
into perch.ndb.mysql.com:/home/jonas/src/51-work
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbTransaction.cpp:
Auto merged
storage/ndb/src/ndbapi/Ndbif.cpp:
Auto merged
storage/ndb/test/ndbapi/testIndex.cpp:
Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
Auto merged
storage/ndb/test/ndbapi/testBasic.cpp:
merge
incorrect handling of commit/ignore error in unique index code
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
1) handle potential ptr error
2) remove incorrect commit-handling in uk code
ndb/src/ndbapi/NdbTransaction.cpp:
1) force 4012
2) handle AO_IgnoreError in uk code
ndb/src/ndbapi/Ndbif.cpp:
force 4012
ndb/test/ndbapi/testIndex.cpp:
test program for 25059
ndb/test/run-test/daily-basic-tests.txt:
add testcase
make sure apicon timer is reset when setting CS_CONNECTED
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
make sure apicon timer is reset when setting CS_CONNECTED
make sure not too poll to long, in case of hb-failure of last db-node
storage/ndb/src/ndbapi/Ndbif.cpp:
Make sure not to poll too long
storage/ndb/src/ndbapi/TransporterFacade.cpp:
Make sure not to poll too long
make sure DISK flag is set on DATA column for blob table
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
maek sure DISK flag is set on DATA column fro blob table
storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp:
maek sure DISK flag is set on DATA column fro blob table
Fix in bug fix, make sure LCP_SKIP is only used for inserts...
storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp:
Make sure LCP_SKIP is only used for inserts
Fix start transaction with hint from ndbapi
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Fix fragments array for API
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Fix fragments array for API
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Fix fragments array for API
Fix bug in previous changeset...causing SR problems with disk
storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp:
fix some more strict-aliasing problems
storage/ndb/src/kernel/blocks/tsman.cpp:
Fix newly introduced bug
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
storage/ndb/include/mgmapi/mgmapi_config_parameters.h:
Auto merged
storage/ndb/src/kernel/blocks/lgman.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
Auto merged
fix alloc/free extent in undo log
allow extent to be reused once a lcp is finished (instead of when next lcp starts)
storage/ndb/include/kernel/signaldata/Extent.hpp:
Add lsn to alloc extent
storage/ndb/src/kernel/blocks/diskpage.hpp:
Add (unused) undo entries for drop table, and alloc/free extent
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Notify TSMAN of both start and stop of LCP
storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
1) Add unused undo entries for drop table, alloc/free extent
2) handle create_table better (correct?) in undo log
3) fix some typos/style
storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp:
1) Add unused undo entries for drop table, alloc/free extent
2) handle create_table better (correct?) in undo log
3) fix some typos/style
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
fix style
storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
fix typo/style
storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
Make sure regFragPtr.p->m_logfile_group_id = RNIL is applicable
storage/ndb/src/kernel/blocks/lgman.cpp:
Add m_logfile_group_id to log callback
storage/ndb/src/kernel/blocks/print_file.cpp:
Add (unused) undo entries for drop table, and alloc/free extent
storage/ndb/src/kernel/blocks/tsman.cpp:
1) change so that LCP limit on resuse of extent is only for duration of lcp
2) refactor so lookup_extent is put into subroutine
storage/ndb/src/kernel/blocks/tsman.hpp:
refactor so lookup_extent is put into subroutine
storage/ndb/include/mgmapi/mgmapi_config_parameters.h:
Add new config paramemter
storage/ndb/src/kernel/blocks/dbacc/Dbacc.hpp:
add support for periodic mem-reporting
storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
add support for periodic mem-reporting
storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
add support for periodic mem-reporting
storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
add support for periodic mem-reporting
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
add support for periodic mem-reporting
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
Auto merged
1) run lcp snapshot for both MM and DD tables (so I dont have to change restore to use WRITE)
2) fix >= and > bug in lcp skip/keep handling
3) very cool test prog for this :-)
storage/ndb/include/kernel/signaldata/BackupContinueB.hpp:
Add new error insert
storage/ndb/src/kernel/blocks/ERROR_codes.txt:
Add new error insert
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
Add new error insert
storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp:
1) get >= and > correct for lcp keep/skip
2) always run lcp snapshot impl. (previously only for dd tables)
storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp:
1) get >= and > correct for lcp keep/skip
2) always run lcp snapshot impl. (previously only for dd tables)
storage/ndb/test/ndbapi/testSystemRestart.cpp:
add testcase
storage/ndb/test/run-test/daily-basic-tests.txt:
add testcase
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1
mysql-test/r/type_varchar.result:
Auto merged
mysql-test/t/type_varchar.test:
Auto merged
sql/item_func.cc:
Auto merged
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1
mysql-test/r/ndb_update.result:
Auto merged
mysql-test/r/type_varchar.result:
Auto merged
mysql-test/t/type_varchar.test:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/item_func.cc:
Auto merged
storage/ndb/src/common/util/socket_io.cpp:
Auto merged
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
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/SimulatedBlock.cpp:
Auto merged
storage/ndb/src/mgmsrv/Services.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbTransaction.cpp:
Auto merged
storage/ndb/src/ndbapi/ndberror.c:
Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
Auto merged
storage/ndb/tools/ndb_condig.cpp:
Auto merged
storage/ndb/src/common/util/File.cpp:
Merge
storage/ndb/src/common/util/InputStream.cpp:
Merge
into dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE2/mysql-5.1
mysql-test/r/type_varchar.result:
Auto merged
mysql-test/t/type_varchar.test:
Auto merged
sql/item_func.cc:
Auto merged
fixed a valgrind warning
type_varchar.test:
fixed a valgrind warning
mysql-test/t/type_varchar.test:
fixed a valgrind warning
sql/item_func.cc:
fixed a valgrind warning
If --srcdir and --windows is given, check if error message file
is in source or build tree (bug#24557)
Makefile.am:
Cleaned up "ali_check" target, to satisfy "distcleancheck" (bug#24557)
mysql_install_db.sh:
Added --srcdir=DIR option, used from top Makefile.am in dist-hook
target, to find "fill_help_tables.sql" in VPATH build (bug#24557)
Makefile.am:
Work around problem with "distcleancheck", "sql_yacc.cc" might be in both
the source and build tree.
Call "mysql_install_db" with new option --srcdir, to enable the script
to find all that is needed, if source and build directory is not the same
(bug#24557)
scripts/mysql_install_db.sh:
If --srcdir and --windows is given, check if error message file
is in source or build tree (bug#24557)
Makefile.am:
Work around problem with "distcleancheck", "sql_yacc.cc" might be in both
the source and build tree.
Call "mysql_install_db" with new option --srcdir, to enable the script
to find all that is needed, if source and build directory is not the same
(bug#24557)
include/Makefile.am:
Cleaned up "ali_check" target, to satisfy "distcleancheck" (bug#24557)
Adjusted for storage path
nwbootstrap:
Corrected bad merge
netware/BUILD/nwbootstrap:
Corrected bad merge
netware/myisam_ftdump.def:
Adjusted for storage path
netware/myisamchk.def:
Adjusted for storage path
netware/myisamlog.def:
Adjusted for storage path
netware/myisampack.def:
Adjusted for storage path
into mysql.com:/home/kent/bk/mysql-5.1-build
client/mysqltest.c:
Auto merged
libmysql/libmysql.c:
Auto merged
mysql-test/lib/mtr_process.pl:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
sql/field.cc:
Auto merged
sql/item.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/item_sum.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_cache.cc:
Auto merged
sql/sql_trigger.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/table.cc:
Auto merged
