At file:///home/psergey/dev/maria-5.2-dsmrr/
------------------------------------------------------------
revno: 2741
revision-id: psergey@askmonty.org-20091222124915-o7lf73nr9z66mwsb
parent: psergey@askmonty.org-20091222123321-i4t0owvlu0d6hb08
parent: igor@askmonty.org-20091221183447-z0shnu5ev2bie8re
committer: Sergey Petrunya
branch nick: maria-5.2-dsmrr
timestamp: Tue 2009-12-22 15:49:15 +0300
message:
Merge MWL#67: MRR Backport and BKA backport.
added:
mysql-test/r/join_cache.result join_cache.result-20091221012827-jfu65h0x5bmixhh3-1
mysql-test/r/join_nested_jcl6.result join_nested_jcl6.res-20091221012846-avi031x14p6hixd0-1
mysql-test/r/join_outer_jcl6.result join_outer_jcl6.resu-20091221012858-uiftww98yhc31z02-1
mysql-test/r/select_jcl6.result select_jcl6.result-20091221012908-0kl039gl68crw8rz-1
mysql-test/t/join_cache.test join_cache.test-20091221012705-n3szmbc9blgmmu84-1
mysql-test/t/join_nested_jcl6.test join_nested_jcl6.tes-20091221012750-sjqit7xbe25ftruq-1
mysql-test/t/join_outer_jcl6.test join_outer_jcl6.test-20091221012801-o5twtzidaput2mme-1
mysql-test/t/select_jcl6.test select_jcl6.test-20091221012812-9nyqqeyzl7d004m6-1
sql/sql_join_cache.cc sql_join_cache.cc-20091221012625-ipp8zu28iijhjmq2-1
modified:
libmysqld/CMakeLists.txt sp1f-cmakelists.txt-20060403082523-x3vxka3k56u2wpzwcrlpykznlz2akpxd
libmysqld/Makefile.am sp1f-makefile.am-20010411110351-26htpk3ynkyh7pkfvnshztqrxx3few4g
mysql-test/r/index_merge_myisam.result sp1f-index_merge_myisam.r-20060816114353-wd2664hjxwyjdvm4snup647av5fmxfln
mysql-test/r/join_outer.result sp1f-join_outer.result-20001228015633-vk2jshiracfus3ze2d2bim2csnnrc5us
mysql-test/r/table_elim.result table_elim.result-20090603125022-nge13y0ohk1g2tt2-1
sql/CMakeLists.txt sp1f-cmakelists.txt-20060831175237-esoeu5kpdtwjvehkghwy6fzbleniq2wy
sql/Makefile.am sp1f-makefile.am-19700101030959-xsjdiakci3nqcdd4xl4yomwdl5eo2f3q
sql/field.cc sp1f-field.cc-19700101030959-f4imaofclsea3n4fj4ow5m7havmyxa2r
sql/item.cc sp1f-item.cc-19700101030959-u7hxqopwpfly4kf5ctlyk2dvrq4l3dhn
sql/item.h sp1f-item.h-19700101030959-rrkb43htudd62batmoteashkebcwykpa
sql/mysqld.cc sp1f-mysqld.cc-19700101030959-zpswdvekpvixxzxf7gdtofzel7nywtfj
sql/opt_index_cond_pushdown.cc opt_index_cond_pushd-20091222114938-i4xsno315subf13e-1
sql/set_var.cc sp1f-set_var.cc-20020723153119-nwbpg2pwpz55pfw7yfzaxt7hsszzy7y3
sql/sql_class.h sp1f-sql_class.h-19700101030959-jnqnbrjyqsvgncsibnumsmg3lyi7pa5s
sql/sql_select.cc sp1f-sql_select.cc-19700101030959-egb7whpkh76zzvikycs5nsnuviu4fdlb
sql/sql_select.h sp1f-sql_select.h-19700101030959-oqegfxr76xlgmrzd6qlevonoibfnwzoz
storage/myisam/ha_myisam.cc sp1f-ha_myisam.cc-19700101030959-7xzssylbn7zfz3nupnsw43wws6xlltsu
------------------------------------------------------------
revno: 2738.1.2
revision-id: igor@askmonty.org-20091221183447-z0shnu5ev2bie8re
parent: igor@askmonty.org-20091221022615-kx5ieiu0okmiupuc
parent: psergey@askmonty.org-20091219195454-yzk3mszr3jbn3fib
committer: Igor Babaev
branch nick: maria-5.2-bka
timestamp: Mon 2009-12-21 10:34:47 -0800
message:
Merge from 5.2-dsmrr
modified:
mysql-test/r/innodb_mrr.result innodb_mrr.result-20091215071342-e3drfbiqqrmxrpri-1
mysql-test/r/type_date.result sp1f-type_date.result-20001228015634-drbo6443s5wzxlf3enjz3qt43ttjf6ik
------------------------------------------------------------
revno: 2738.1.1
revision-id: igor@askmonty.org-20091221022615-kx5ieiu0okmiupuc
parent: psergey@askmonty.org-20091216092851-9ehou85ydmgziniy
committer: Igor Babaev
branch nick: maria-5.2-bka
timestamp: Sun 2009-12-20 18:26:15 -0800
message:
Backport into MariaDB-5.2 the following:
WL#2771 "Block Nested Loop Join and Batched Key Access Join"
added:
mysql-test/r/join_cache.result join_cache.result-20091221012827-jfu65h0x5bmixhh3-1
mysql-test/r/join_nested_jcl6.result join_nested_jcl6.res-20091221012846-avi031x14p6hixd0-1
mysql-test/r/join_outer_jcl6.result join_outer_jcl6.resu-20091221012858-uiftww98yhc31z02-1
mysql-test/r/select_jcl6.result select_jcl6.result-20091221012908-0kl039gl68crw8rz-1
mysql-test/t/join_cache.test join_cache.test-20091221012705-n3szmbc9blgmmu84-1
mysql-test/t/join_nested_jcl6.test join_nested_jcl6.tes-20091221012750-sjqit7xbe25ftruq-1
mysql-test/t/join_outer_jcl6.test join_outer_jcl6.test-20091221012801-o5twtzidaput2mme-1
mysql-test/t/select_jcl6.test select_jcl6.test-20091221012812-9nyqqeyzl7d004m6-1
sql/sql_join_cache.cc sql_join_cache.cc-20091221012625-ipp8zu28iijhjmq2-1
modified:
libmysqld/CMakeLists.txt sp1f-cmakelists.txt-20060403082523-x3vxka3k56u2wpzwcrlpykznlz2akpxd
libmysqld/Makefile.am sp1f-makefile.am-20010411110351-26htpk3ynkyh7pkfvnshztqrxx3few4g
mysql-test/r/index_merge_myisam.result sp1f-index_merge_myisam.r-20060816114353-wd2664hjxwyjdvm4snup647av5fmxfln
mysql-test/r/join_outer.result sp1f-join_outer.result-20001228015633-vk2jshiracfus3ze2d2bim2csnnrc5us
mysql-test/r/table_elim.result table_elim.result-20090603125022-nge13y0ohk1g2tt2-1
sql/CMakeLists.txt sp1f-cmakelists.txt-20060831175237-esoeu5kpdtwjvehkghwy6fzbleniq2wy
sql/Makefile.am sp1f-makefile.am-19700101030959-xsjdiakci3nqcdd4xl4yomwdl5eo2f3q
sql/ds_mrr.cc ds_mrr.cc-20091215071355-ng9ts7xzl29j711s-1
sql/field.cc sp1f-field.cc-19700101030959-f4imaofclsea3n4fj4ow5m7havmyxa2r
sql/item.cc sp1f-item.cc-19700101030959-u7hxqopwpfly4kf5ctlyk2dvrq4l3dhn
sql/item.h sp1f-item.h-19700101030959-rrkb43htudd62batmoteashkebcwykpa
sql/mysqld.cc sp1f-mysqld.cc-19700101030959-zpswdvekpvixxzxf7gdtofzel7nywtfj
sql/set_var.cc sp1f-set_var.cc-20020723153119-nwbpg2pwpz55pfw7yfzaxt7hsszzy7y3
sql/sql_class.h sp1f-sql_class.h-19700101030959-jnqnbrjyqsvgncsibnumsmg3lyi7pa5s
sql/sql_select.cc sp1f-sql_select.cc-19700101030959-egb7whpkh76zzvikycs5nsnuviu4fdlb
sql/sql_select.h sp1f-sql_select.h-19700101030959-oqegfxr76xlgmrzd6qlevonoibfnwzoz
storage/myisam/ha_myisam.cc sp1f-ha_myisam.cc-19700101030959-7xzssylbn7zfz3nupnsw43wws6xlltsu
Diff too large for email (19551 lines, the limit is 1000).
Sergey Petrunya