into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
Handle early abort of scan, so that resources are correctly freed
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
Handle early abort
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Handle early abort so that require on running.empty() does not fire
- the replica info was not stored in byte order indepentent format
- backup/restore still compatible 5.0->5.1
- but patch makes previous 5.1 versions completely incompatible
1) relax version check for restore block since no changes has happend since 5.1.6
and improve error message on check failure
2) improve lcp/backup max write size...
storage/ndb/src/kernel/blocks/backup/BackupInit.cpp:
Increase max write size to 256k (currently not configurable...)
storage/ndb/src/kernel/blocks/restore.cpp:
Relax version check for restore block since no changes has happend since 5.1.6
storage/ndb/src/kernel/blocks/restore.hpp:
Relax version check for restore block since no changes has happend since 5.1.6
client/mysql.cc:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/r/func_gconcat.result:
Auto merged
mysql-test/t/rpl_relayrotate.test:
Auto merged
mysys/mf_keycache.c:
Auto merged
BitKeeper/deleted/.del-innodb_unsafe_binlog-master.opt~9cbe1bb3d8696c5b:
Auto merged
mysql-test/t/rpl_stm_until.test:
Auto merged
sql/item_func.cc:
Auto merged
sql/lock.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_union.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/unireg.h:
Auto merged
storage/ndb/src/kernel/SimBlockList.cpp:
Auto merged
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrInit.cpp:
Auto merged
into mysql.com:/usr/local/mysql/mysql-5.0-mtr-fix
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/t/case.test:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
mysql-test/r/case.result:
SCCS merged
- this behavior was already changed, adding testcase
mysql-test/r/ndb_binlog_discover.result:
New BitKeeper file ``mysql-test/r/ndb_binlog_discover.result''
mysql-test/t/ndb_binlog_discover.test:
New BitKeeper file ``mysql-test/t/ndb_binlog_discover.test''
into zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1-new
client/mysql.cc:
Auto merged
mysql-test/r/func_str.result:
Auto merged
mysql-test/t/mysql.test:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/item_strfunc.h:
Auto merged
storage/ndb/src/kernel/vm/Emulator.cpp:
Auto merged
storage/ndb/src/mgmclient/CommandInterpreter.cpp:
Auto merged
mysql-test/r/innodb.result:
Corrected from manual merge. I know the numbers are right (it's a
7,7-seeded fibbonaci sequence), but I don't know how I missed the latter
line.
into zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1-new
Merge by hand. This may not be right.
mysql-test/r/innodb.result:
Merge by hand. (Yay, vimdiff)
mysql-test/t/innodb.test:
Merge by hand. (Yay, vimdiff)
- changed alter tablespace truct to work with handlerton pointer (to avoid crash in parser on unknown db type"
- pushed warnings when default storage engine is used and/or tablespace stuff is not supported by storage engine
mysql-test/r/ndb_dd_basic.result:
bug#18604 create logfile for MyISAM tables
mysql-test/t/ndb_dd_basic.test:
bug#18604 create logfile for MyISAM tables
into april.(none):/home/svoj/devel/mysql/merge/mysql-5.1-new
mysql-test/r/ctype_ucs.result:
Auto merged
mysql-test/t/ctype_ucs.test:
Auto merged
mysql-test/t/rpl_view-slave.opt:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/item_timefunc.h:
Auto merged
sql/mysqld.cc:
Auto merged
storage/myisam/mi_packrec.c:
Manual merge: use local, since this fix should be moved into mi_dynmap_file().
into sanja.is.com.ua:/home/bell/mysql/bk/work-merge-5.1
configure.in:
Auto merged
mysql-test/r/view.result:
Auto merged
mysql-test/t/view.test:
Auto merged
sql/item_func.cc:
Auto merged
sql/sql_view.cc:
Auto merged
sql/share/errmsg.txt:
merge
mysql-test/r/events_logs_tests.result:
update result
mysql-test/r/events_scheduling.result:
update result
mysql-test/t/events_logs_tests.test:
fix test
mysql-test/t/events_scheduling.test:
add test case for bug 19170
Fix various abort cases (mainly MM but also 1 DD)
that has been found running dbt2
storage/ndb/src/kernel/blocks/dbtup/DbtupAbort.cpp:
Fix abort case
storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp:
Set page dirty even if in cache
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
Fix abort case
storage/ndb/test/ndbapi/testBasic.cpp:
Add new testcases for various abort cases
storage/ndb/test/run-test/daily-basic-tests.txt:
Add autotest of various abort cases
myisam_ftdump options: --help first, then rest in
lexical order.
myisam/myisam_ftdump.c:
myisam_ftdump options: --help first, then rest in
lexical order.
