#At file:///work2/6.0/mysql-6.0-bugteam-clone1/
------------------------------------------------------------
revno: 2811
revision-id: mleich@stripped
parent: kgeorge@stripped
parent: mleich@stripped
committer: Matthias Leich <mleich@stripped>
branch nick: mysql-6.0-bugteam-clone1
timestamp: Do 2008-08-28 14:05:10 +0200
message:
Upmerge, no conflicts because everything is
already in 6.0-bugteam
------------------------------------------------------------
revno: 2497.388.7
revision-id: mleich@stripped
parent: mleich@stripped
parent: kgeorge@stripped
committer: Matthias Leich <mleich@stripped>
branch nick: mysql-5.1-bugteam-1
timestamp: Do 2008-08-28 13:39:53 +0200
message:
Merge into local tree
added:
mysql-test/include/mysqlbinlog_row_engine.inc mysqlbinlog_row_engi-20080820140255-9a0qrnzcj0im381c-1
mysql-test/include/wait_for_slave_sql_error_and_skip.inc wait_for_slave_sql_e-20080730094959-x5zfv077cyzps37w-1
mysql-test/r/mysqlbinlog_row.result mysqlbinlog_row.resu-20080820140336-qltyuhvnlnekw1ir-4
mysql-test/r/mysqlbinlog_row_big.result mysqlbinlog_row_big.-20080820140336-qltyuhvnlnekw1ir-1
mysql-test/r/mysqlbinlog_row_innodb.result mysqlbinlog_row_inno-20080820140336-qltyuhvnlnekw1ir-2
mysql-test/r/mysqlbinlog_row_myisam.result mysqlbinlog_row_myis-20080820140336-qltyuhvnlnekw1ir-3
mysql-test/r/mysqlbinlog_row_trans.result mysqlbinlog_row_tran-20080820140336-qltyuhvnlnekw1ir-5
mysql-test/suite/rpl/r/rpl_filter_tables_not_exist.result rpl_filter_tables_no-20080730094122-ywj30q70xy9542li-1
mysql-test/suite/rpl/t/rpl_filter_tables_not_exist-slave.opt rpl_filter_tables_no-20080730094116-4veopgu0zx3i0dwt-1
mysql-test/suite/rpl/t/rpl_filter_tables_not_exist.test rpl_filter_tables_no-20080730094116-4veopgu0zx3i0dwt-2
mysql-test/t/mysqlbinlog_row.test mysqlbinlog_row.test-20080820140328-lzq6n1bc06curs14-4
mysql-test/t/mysqlbinlog_row_big.test mysqlbinlog_row_big.-20080820140328-lzq6n1bc06curs14-1
mysql-test/t/mysqlbinlog_row_innodb.test mysqlbinlog_row_inno-20080820140328-lzq6n1bc06curs14-2
mysql-test/t/mysqlbinlog_row_myisam.test mysqlbinlog_row_myis-20080820140328-lzq6n1bc06curs14-3
mysql-test/t/mysqlbinlog_row_trans.test mysqlbinlog_row_tran-20080820140328-lzq6n1bc06curs14-5
modified:
.bzrignore sp1f-ignore-20001018235455-q4gxfbritt5f42nwix354ufpsvrf5ebj
client/Makefile.am sp1f-makefile.am-19700101030959-zpaig4zjwqhmsob3ypilmrcrkq7pu6gf
client/mysqlbinlog.cc sp1f-mysqlbinlog.cc-19700101030959-b3vgyo47ljent5mhbyj6ik33bi4bukad
mysql-test/extra/binlog_tests/database.test sp1f-database.test-20071116145519-lwug5tldyng5aohbxcucrrt2csusipi5
mysql-test/r/group_min_max.result sp1f-group_min_max.result-20040827133611-aqzadxttbw23mkanmvdsiaambv2pcy27
mysql-test/r/multi_update.result sp1f-multi_update.result-20010611232825-7f2vetuxiyd3bu5lefd5a2ze43xed33y
mysql-test/r/myisam.result sp1f-myisam.result-20010411215653-pgxkk2xg4lh3nxresmfnsuszf5h3nont
mysql-test/r/partition_symlink.result sp1f-partition_symlink.re-20071112122343-3fdoma4qosnti7nipjjgehbsap5aos64
mysql-test/r/subselect.result sp1f-subselect.result-20020512204640-zgegcsgavnfd7t7eyrf7ibuqomsw7uzo
mysql-test/r/symlink.result sp1f-symlink.result-20010605003810-qspjjr4hwq7gpdhzyictx52ddrlmxaco
mysql-test/r/type_bit.result sp1f-type_bit.result-20041217140559-ppf6bkjkl3r4tbmlt7ngn46zm6tapa46
mysql-test/suite/binlog/r/binlog_database.result sp1f-binlog_database.resu-20071116145519-32d2hjsq4hsav2a6la27nbyjq2rdx64g
mysql-test/suite/binlog/r/binlog_innodb.result sp1f-binlog_innodb.result-20070612194656-qxyqgtm3jk5nq67w5hqbva3qij23iwfu
mysql-test/suite/jp/std_data/jisx0208_sjis2.dat sp1f-jisx0208_sjis2.dat-20050107083212-shwd7d6og2akos5bkhlieyuutdmnwan6
mysql-test/suite/jp/t/disabled.def sp1f-disabled.def-20080515160110-qvy2ybr6ayn3gv6bs7jh4ityvld356qd
mysql-test/t/group_min_max.test sp1f-group_min_max.test-20040827133612-bbe7hj6l7byvtyxsg4iicylzflsgy6vj
mysql-test/t/myisam.test sp1f-myisam.test-20010411215653-cdmhjqbeu3xtipkauwbbirystludnac3
mysql-test/t/partition_symlink.test sp1f-partition_symlink.te-20071112122343-27bxdsrdkiwylyz7ta6xrna2qc5pdlbr
mysql-test/t/subselect.test sp1f-subselect.test-20020512204640-lyqrayx6uwsn7zih6y7kerkenuitzbvr
mysql-test/t/symlink.test sp1f-symlink.test-20010605003810-7slktyzeszzfljtnmdbque4ow3azjqty
mysql-test/t/type_bit.test sp1f-type_bit.test-20041217140559-tzpygypzmjyjiukpq75swmn6zq4ytqe4
mysys/my_symlink.c sp1f-my_symlink.c-20010531091851-nnlz7igptpjfrbgf6sspd6vtv2hv63ab
mysys/thr_lock.c sp1f-thr_lock.c-19700101030959-igvxgo25qd7i2moc4pgo5eoth3xp34mh
sql/field.h sp1f-field.h-19700101030959-3n6smzxcwkjl7bikm3wg4hfkjn66uvvp
sql/log_event.cc sp1f-log_event.cc-19700101030959-msmqlflsngxosswid2hpzxly5vfqdddc
sql/log_event.h sp1f-log_event.h-19700101030959-clq6ett55tcqbpys2i4cpfrdccq7j4om
sql/opt_range.cc sp1f-opt_range.cc-19700101030959-afe3wtevb7zwrg4xyibt35uamov5r7ds
sql/opt_range.h sp1f-opt_range.h-19700101030959-c2qbh5kplyvzfgawblxt4md4ubdpxfdy
sql/rpl_tblmap.cc sp1f-rpl_tblmap.cc-20051222053448-sgowtys7fb4tdpjvmzwktjxmb5krm3cc
sql/rpl_tblmap.h sp1f-rpl_tblmap.h-20051222053448-apxxow74g26tfxwlqszpydaybbzp2r3i
sql/rpl_utility.h sp1f-rpl_utility.h-20060503130029-u44nzzcbdenh2gegnnyzro26kbk5quw7
sql/sql_base.cc sp1f-sql_base.cc-19700101030959-w7tul2gb2n4jzayjwlslj3ybmf3uhk6a
sql/sql_class.cc sp1f-sql_class.cc-19700101030959-rpotnweaff2pikkozh3butrf7mv3oero
sql/sql_class.h sp1f-sql_class.h-19700101030959-jnqnbrjyqsvgncsibnumsmg3lyi7pa5s
sql/sql_db.cc sp1f-sql_db.cc-19700101030959-hyw6zjuisjyda5cj5746a2zzuzz5yibr
sql/sql_parse.cc sp1f-sql_parse.cc-19700101030959-ehcre3rwhv5l3mlxqhaxg36ujenxnrcd
sql/sql_select.cc sp1f-sql_select.cc-19700101030959-egb7whpkh76zzvikycs5nsnuviu4fdlb
sql/sql_update.cc sp1f-sql_update.cc-19700101030959-edlgskfuer2ylczbw2znrr5gzfefiyw7
storage/myisam/mi_create.c sp1f-mi_create.c-19700101030959-i6lazhpsyf7ggr2yjukf6xxybhraxup3
storage/myisam/mi_static.c sp1f-mi_static.c-19700101030959-tdmnpz55hlrequ6y4hc3azz6hpxqfv75
storage/myisam/rt_index.c sp1f-rt_index.c-20020220101115-g73ue5aednwitjcl3kv42tqfijyn3454
Attachment: [text/text/x-diff] patch-2811.diff
| Thread |
|---|
| • bzr commit into mysql-6.0 tree (mleich:2811) | Matthias Leich | 28 Aug |
