- 25 Apr, 2006 10 commits
-
-
unknown authored
the fix from 5.0 with necessary modifications applied. sql/sql_base.cc: Manual merge with 5.0.
-
unknown authored
into mysql.com:/home/elkin/MySQL/MERGE/5.1-new mysql-test/mysql-test-run.pl: Auto merged mysql-test/r/case.result: Auto merged mysql-test/r/rpl_temporary.result: Auto merged mysql-test/t/case.test: Auto merged mysql-test/t/rpl_temporary.test: Auto merged sql/item_cmpfunc.cc: Auto merged sql/item_strfunc.cc: Auto merged storage/myisam/myisam_ftdump.c: Auto merged sql/sql_base.cc: manual merge use local. Another changeset for 5.1 is following.
-
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
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 mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
-
unknown authored
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
-
unknown authored
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new sql/ha_ndbcluster.cc: Auto merged
-
unknown authored
-
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
-
- 24 Apr, 2006 19 commits
-
-
unknown authored
into mysql.com:/data0/knielsen/mysql-5.0-mtr-fix
-
unknown authored
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
-
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
-
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
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
mysql-test/mysql-test-run.pl: Fix typo.
-
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 mysql.com:/data0/knielsen/mysql-4.1-mtr-fix
-
unknown authored
into mysql.com:/M50/mysql-5.0
-
unknown authored
into production.mysql.com:/usersnfs/rkalimullin/4.1.b17896
-
unknown authored
into polar.kitebird.com:/src/extern/MySQL/bk/mysql-5.0
-
unknown authored
into polar.kitebird.com:/src/extern/MySQL/bk/mysql-4.1
-
unknown authored
into polar.kitebird.com:/src/extern/MySQL/bk/mysql-5.0
-
unknown authored
myisam_ftdump options: --help first, then rest in lexical order. myisam/myisam_ftdump.c: myisam_ftdump options: --help first, then rest in lexical order.
-
- 23 Apr, 2006 11 commits
-
-
unknown authored
into mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.0 sql/sql_base.cc: manual merge use local
-
unknown authored
into mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.0 mysql-test/r/rpl_temporary.result: Auto merged mysql-test/t/rpl_temporary.test: Auto merged sql/sql_base.cc: Auto merged
-
unknown authored
The fix refines the algorithm of generating DROPs for binlog. Temp tables with common pseudo_thread_id are clustered into one query. Consequently one replication event per pseudo_thread_id is generated. mysql-test/r/rpl_temporary.result: results mysql-test/t/rpl_temporary.test: Creating temp tables associated with a set of pseudo_thread_id values within a connection. The aim is to see that slave digest master's binlog consisting of DROP temprorary tables. sql/sql_base.cc: close_temporary_tables is rewritten to generate sequence of DROP temprorary tables with common preudo_thread_id stored in temp table definition.
-
unknown authored
accounting non-ai32 in tmpkeyval. This changeset is supposed to be specifically for 4.1. Another changeset is going to push into 5. sql/sql_base.cc: correction due to uint4korr definition: can not sizeof on not ia32.
-
unknown authored
-
unknown authored
into mysql.com:/home/alexi/innodb/mysql-5.1
-
unknown authored
-
unknown authored
into mysql.com:/home/alexi/innodb/mysql-5.1 sql/ha_innodb.cc: Auto merged mysql-test/r/innodb.result: Hand-merge mysql-test/t/innodb.test: Hand_merge
-
unknown authored
-
unknown authored
into mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.0 mysql-test/r/rpl_temporary.result: manual merge use local
-
unknown authored
into mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.0 mysql-test/t/func_compress.test: Auto merged sql/item_strfunc.cc: Auto merged
-