- 25 Apr, 2006 24 commits
-
-
unknown authored
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new mysql-test/t/disabled.def: Auto merged sql/sql_yacc.yy: Auto merged
-
unknown authored
mysql-test/extra/rpl_tests/rpl_insert_id.test: Post-merge fix. Added new 5.0 test case manually. sql/sql_yacc.yy: Post-merge fix. Removed GOTO/LABEL from parser.
-
unknown authored
-
unknown authored
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb sql/sql_yacc.yy: Auto merged
-
unknown authored
Fix bootstrap/compile error storage/ndb/tools/restore/restore_main.cpp: Fix bootstrap/compile error
-
unknown authored
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp: Auto merged
-
unknown authored
-
unknown authored
into mysql.com:/extern/mysql/5.1/generic/mysql-5.1-new mysql-test/r/innodb.result: Auto merged mysql-test/r/sp.result: Auto merged mysql-test/r/timezone_grant.result: Auto merged mysql-test/r/trigger.result: Auto merged mysql-test/r/view.result: Auto merged mysql-test/t/innodb.test: Auto merged mysql-test/t/sp.test: Auto merged mysql-test/t/trigger.test: Auto merged mysql-test/t/view.test: Auto merged sql/lex.h: Auto merged sql/sp.cc: Auto merged sql/sp_head.cc: Auto merged sql/sp_head.h: Auto merged sql/sql_class.cc: Auto merged sql/sql_view.cc: Auto merged mysql-test/r/rpl_insert_id.result: Manual merge. mysql-test/t/disabled.def: Manual merge. mysql-test/t/rpl_insert_id.test: Manual merge. sql/item_func.cc: Manual merge. sql/sql_yacc.yy: Manual merge - not complete yet.
-
unknown authored
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp: Auto merged
-
unknown authored
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
-
unknown authored
into perch.ndb.mysql.com:/home/jonas/src/50-work ndb/src/kernel/blocks/dbtc/Dbtc.hpp: Auto merged ndb/src/kernel/blocks/dbtc/DbtcMain.cpp: Auto merged
-
unknown authored
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
-
unknown authored
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
-
unknown authored
- 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
-
unknown authored
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
-
unknown authored
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
-
unknown authored
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new sql/ha_ndbcluster.cc: Auto merged
-
unknown authored
-
unknown authored
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
-
unknown authored
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
-
unknown authored
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new-ndb
-
unknown authored
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new-ndb
-
unknown authored
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
-
unknown authored
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
-
- 24 Apr, 2006 16 commits
-
-
unknown authored
- 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''
-
unknown authored
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
-
unknown authored
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.
-
unknown authored
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)
-
unknown authored
- 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
-
unknown authored
-
unknown authored
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().
-
unknown authored
-
unknown authored
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
-
unknown authored
-
unknown authored
Fix for Bug #17840 mysqldump should not dump tables in database cluster, skip cluster internal database client/mysqldump.c: Fix for Bug #17840 mysqldump should not dump tables in database , skip cluster internal database
-
unknown authored
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
-
unknown authored
-
unknown authored
-
unknown authored
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
-
unknown authored
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
-