[Commits] Rev 3116: Automatic merge in lp:maria/5.3

Michael Widenius monty at askmonty.org
Fri Aug 12 16:14:48 EEST 2011


At lp:maria/5.3

------------------------------------------------------------
revno: 3116 [merge]
revision-id: monty at askmonty.org-20110812131443-oppgytfxivr5ls6e
parent: monty at askmonty.org-20110812080039-18ny2sm2fp1pbdsa
parent: sanja at askmonty.org-20110812113140-5jj5d2cdgzq1dbsy
committer: Michael Widenius <monty at askmonty.org>
branch nick: maria-5.3
timestamp: Fri 2011-08-12 16:14:43 +0300
message:
  Automatic merge
added:
  mysql-test/r/derived_opt.result derived_opt.result-20110721212223-g2nx9j3pfti1fiat-1
  mysql-test/suite/maria/r/max_length.result max_length.result-20110724082228-2iakb8chz97uw5i3-2
  mysql-test/suite/maria/t/max_length.test max_length.test-20110724082228-2iakb8chz97uw5i3-1
  mysql-test/t/derived_opt.test  derived_opt.test-20110721212211-v2zyscflt5w9uts9-1
modified:
  .bzrignore                     sp1f-ignore-20001018235455-q4gxfbritt5f42nwix354ufpsvrf5ebj
  mysql-test/include/ps_query.inc sp1f-ps_query.inc-20040701142627-vtcz6coe5tmnacaqrtnscfx3dgc3e6ty
  mysql-test/lib/mtr_cases.pm    sp1f-mtr_cases.pl-20050203205008-rrteoawyobvgq6u7zeyce4tmuu334ayg
  mysql-test/mysql-test-run.pl   sp1f-mysqltestrun.pl-20041230152716-xjnn5ndv4rr4by6ijmj5a4ysubxc7qh3
  mysql-test/r/derived.result    sp1f-derived.result-20020326130604-7h5qgv4t7i62th7ufm74tv3o2mtgqoqg
  mysql-test/r/derived_view.result derived_view.result-20100429210222-m2cev70na5t81kgl-1
  mysql-test/r/explain.result    sp1f-explain.result-20001228015633-fcck4ixyixae4yjfpahxubumufcrdc7p
  mysql-test/r/func_group.result sp1f-func_group.result-20001228015633-oe57bieiww3s6erojiyha7p26m5ul5ql
  mysql-test/r/func_str.result   sp1f-strfunc.result-20001215085543-qraqxeite2ybbq4se6ojb2lwaxem3br3
  mysql-test/r/group_min_max.result sp1f-group_min_max.result-20040827133611-aqzadxttbw23mkanmvdsiaambv2pcy27
  mysql-test/r/having.result     sp1f-having.result-20010117011520-dxnw4f47strq6d6bsudigvt2gpdir3uw
  mysql-test/r/index_merge_innodb.result sp1f-index_merge_innodb.r-20060816114352-umgqkfavfljswrg7qhdkcoptdwi5gipo
  mysql-test/r/index_merge_myisam.result sp1f-index_merge_myisam.r-20060816114353-wd2664hjxwyjdvm4snup647av5fmxfln
  mysql-test/r/information_schema.result sp1f-information_schema.r-20041113105544-waoxa2fjjsicturpothmjmi6jc3yrovn
  mysql-test/r/join_cache.result join_cache.result-20091221012827-jfu65h0x5bmixhh3-1
  mysql-test/r/join_nested.result sp1f-join_nested.result-20040611052448-f6budidy5a6ethsb7f4oabx4zzvnazuv
  mysql-test/r/join_nested_jcl6.result join_nested_jcl6.res-20091221012846-avi031x14p6hixd0-1
  mysql-test/r/join_outer.result sp1f-join_outer.result-20001228015633-vk2jshiracfus3ze2d2bim2csnnrc5us
  mysql-test/r/join_outer_jcl6.result join_outer_jcl6.resu-20091221012858-uiftww98yhc31z02-1
  mysql-test/r/myisam_mrr.result myisam_mrr.result-20091215071345-6wadxunod6vi8m48-1
  mysql-test/r/negation_elimination.result sp1f-negation_elimination-20031031090152-ze2fadpn555fadcegevzq2ofoulskgjk
  mysql-test/r/optimizer_switch.result optimizer_switch.res-20100716085800-5hzflta9ey32hl2t-1
  mysql-test/r/ps.result         sp1f-ps.result-20040405154119-efxzt5onloys45nfjak4gt44kr4awkdi
  mysql-test/r/range.result      sp1f-range.result-20001228015634-6hpoyn74lnc7irf4gop2jbowgpazbbae
  mysql-test/r/range_mrr_icp.result range_mrr_icp.result-20110708144530-oix2pzfbpykksv5t-1
  mysql-test/r/range_vs_index_merge_innodb.result range_vs_index_merge-20091012044457-ng2xbpvlta5mfvs2-1
  mysql-test/r/subselect.result  sp1f-subselect.result-20020512204640-zgegcsgavnfd7t7eyrf7ibuqomsw7uzo
  mysql-test/r/subselect3.result sp1f-subselect3.result-20061031174245-v7hvtc7uwevifiq4lziwv5gdcxpeak7t
  mysql-test/r/subselect3_jcl6.result subselect3_jcl6.resu-20100117143923-cf6j4mu5zzng00u7-1
  mysql-test/r/subselect4.result subselect4.result-20090903150316-1sul3u8k29ooxm3r-2
  mysql-test/r/subselect_cache.result subquery_cache.resul-20100710101008-oqtsrd0hav47cxxm-4
  mysql-test/r/subselect_mat.result subselect_mat.result-20100117143924-r0jv32dj80dg3b5h-1
  mysql-test/r/subselect_mat_cost_bugs.result subselect_mat_cost_b-20110221145400-p2y6oq6foy9nck9r-1
  mysql-test/r/subselect_no_mat.result subselect_no_mat.res-20100117143924-hut18sl9k2c7qdj8-1
  mysql-test/r/subselect_no_opts.result subselect_no_opts.re-20100117143925-pabg7o8iyokjlu93-1
  mysql-test/r/subselect_no_semijoin.result subselect_no_semijoi-20100117143925-9yfygtcm7fwsuq2p-1
  mysql-test/r/subselect_partial_match.result subselect_partial_ma-20100829135955-qm03uoe8ohwznjw0-1
  mysql-test/r/subselect_scache.result subselect_scache.res-20110713142423-t6lrgrizahbpk2co-2
  mysql-test/r/subselect_sj.result subselect_sj.result-20100117143926-nrop4ku355g3kv8b-1
  mysql-test/r/subselect_sj2.result subselect_sj2.result-20100117143927-4k8x8d6czjviugog-1
  mysql-test/r/subselect_sj2_jcl6.result subselect_sj2_jcl6.r-20100117143927-r3uxj2zuyjtrnokh-1
  mysql-test/r/subselect_sj2_mat.result subselect_sj2_mat.re-20110203133247-60oo2ydzq1r2g7ib-1
  mysql-test/r/subselect_sj_jcl6.result subselect_sj_jcl6.re-20100117143928-7vzk51yaf29cdavp-1
  mysql-test/r/subselect_sj_mat.result subselect_sj_mat.res-20100524221009-pdj0un54npqbnpcr-1
  mysql-test/r/view.result       sp1f-view.result-20040715221517-nqk3l34grrhprjiitidhfjyjqlgh6a5v
  mysql-test/suite/innodb/r/innodb_lock_wait_timeout_1.result bug40113.result-20090619150423-w3im08cym6tyzn8f-3
  mysql-test/suite/innodb/r/innodb_mysql.result sp1f-innodb_mysql.result-20060426055153-bychbbfnqtvmvrwccwhn24i6yi46uqjv
  mysql-test/suite/innodb/t/innodb_mysql.test sp1f-innodb_mysql.test-20060816102624-6ymo37d3nyhvbqyzqn5ohsfuydwo426k
  mysql-test/suite/innodb_plugin/r/innodb_lock_wait_timeout_1.result innodb_lock_wait_tim-20100603082139-wffopwu1usgwcbdg-1
  mysql-test/suite/innodb_plugin/r/innodb_mysql.result innodb_mysql.result-20100603082141-zbgx1bcp4hsrz0ok-2
  mysql-test/suite/innodb_plugin/t/innodb_bug52663.test innodb_bug52663.test-20100426102328-fymyevkummgyc3gm-5
  mysql-test/suite/innodb_plugin/t/innodb_mysql.test innodb_mysql.test-20100603082140-ojv20k5xmfh96e5i-4
  mysql-test/suite/pbxt/r/derived.result derived.result-20090402100035-4ilk9i91sh65vjcb-32
  mysql-test/suite/pbxt/r/func_group.result func_group.result-20090402100035-4ilk9i91sh65vjcb-50
  mysql-test/suite/pbxt/r/group_min_max.result group_min_max.result-20090402100035-4ilk9i91sh65vjcb-69
  mysql-test/suite/pbxt/r/negation_elimination.result negation_elimination-20090402100035-4ilk9i91sh65vjcb-103
  mysql-test/suite/pbxt/r/partition_pruning.result partition_pruning.re-20090402100035-4ilk9i91sh65vjcb-117
  mysql-test/suite/pbxt/r/subselect.result subselect.result-20090402100035-4ilk9i91sh65vjcb-146
  mysql-test/suite/vcol/r/vcol_select_innodb.result vcol_select_innodb.r-20091016212105-1lx2muao9vwbl1c1-41
  mysql-test/suite/vcol/r/vcol_select_myisam.result vcol_select_myisam.r-20091016212105-1lx2muao9vwbl1c1-42
  mysql-test/t/derived.test      sp1f-derived.test-20020326130604-mdjuldldv4iv2xqkrt4c4xbvxdwnljpw
  mysql-test/t/derived_view.test derived_view.test-20100429210209-ex88ainrb3oc2d4n-1
  mysql-test/t/having.test       sp1f-having.test-20010117011520-3pm2b3e2o7l2v2u3232siwcstb3w3yod
  mysql-test/t/join_cache.test   join_cache.test-20091221012705-n3szmbc9blgmmu84-1
  mysql-test/t/join_nested.test  sp1f-join_nested.test-20040611052637-z3yzmier3nrbd4eqdftnu6vfz43qinu5
  mysql-test/t/join_outer.test   sp1f-join_outer.test-20001228015636-himrcptylaquy6l5d7pl7pawom3ytmtw
  mysql-test/t/range.test        sp1f-range.test-20001228015636-xfak6bsaw5p3ek36np7bznadjb3boh2q
  mysql-test/t/subselect.test    sp1f-subselect.test-20020512204640-lyqrayx6uwsn7zih6y7kerkenuitzbvr
  mysql-test/t/subselect4.test   subselect4.test-20090903150316-1sul3u8k29ooxm3r-1
  mysql-test/t/subselect_cache.test subquery_cache.test-20100710101008-oqtsrd0hav47cxxm-3
  mysql-test/t/subselect_mat.test subselect_mat.test-20100117143929-iif102ysgna1tyj0-1
  mysql-test/t/subselect_sj.test subselect_sj.test-20100117143931-qp396ufpe3k0scre-1
  mysql-test/t/subselect_sj_mat.test subselect_sj_mat.tes-20100524220952-cy056unehps9s8xw-1
  mysql-test/t/view.test         sp1f-view.test-20040715221517-2kxb7l4itrpl4mw266xe5gby4vftru3z
  sql/item.cc                    sp1f-item.cc-19700101030959-u7hxqopwpfly4kf5ctlyk2dvrq4l3dhn
  sql/item.h                     sp1f-item.h-19700101030959-rrkb43htudd62batmoteashkebcwykpa
  sql/item_cmpfunc.cc            sp1f-item_cmpfunc.cc-19700101030959-hrk7pi2n6qpwxauufnkizirsoucdcx2e
  sql/item_cmpfunc.h             sp1f-item_cmpfunc.h-19700101030959-pcvbjplo4e4ng7ibynfhcd6pjyem57gr
  sql/item_subselect.cc          sp1f-item_subselect.cc-20020512204640-qep43aqhsfrwkqmrobni6czc3fqj36oo
  sql/item_subselect.h           sp1f-item_subselect.h-20020512204640-qdg77wil56cxyhtc2bjjdrppxq3wqgh3
  sql/item_sum.cc                sp1f-item_sum.cc-19700101030959-4woo23bi3am2t2zvsddqbpxk7xbttdkm
  sql/item_sum.h                 sp1f-item_sum.h-19700101030959-ecgohlekwm355wxl5fv4zzq3alalbwyl
  sql/mysql_priv.h               sp1f-mysql_priv.h-19700101030959-4fl65tqpop5zfgxaxkqotu2fa2ree5ci
  sql/mysqld.cc                  sp1f-mysqld.cc-19700101030959-zpswdvekpvixxzxf7gdtofzel7nywtfj
  sql/opt_range.cc               sp1f-opt_range.cc-19700101030959-afe3wtevb7zwrg4xyibt35uamov5r7ds
  sql/opt_range.h                sp1f-opt_range.h-19700101030959-c2qbh5kplyvzfgawblxt4md4ubdpxfdy
  sql/opt_subselect.cc           opt_subselect.cc-20100215190428-nekkl8wisp0k6nlk-1
  sql/opt_sum.cc                 sp1f-opt_sum.cc-19700101030959-ygmsylwaxwx3wf77i2nv2hdupycvexro
  sql/records.cc                 sp1f-records.cc-19700101030959-xg6elqzdqhvrmobazxrjajmiyqxf7lx7
  sql/share/errmsg.txt           sp1f-errmsg.txt-20041213212820-do5w642w224ja7ctyqhyl6iihdmpkzv5
  sql/sql_acl.cc                 sp1f-sql_acl.cc-19700101030959-c4hku3uqxzujthqnndeprbrhamqy6a4i
  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_delete.cc              sp1f-sql_delete.cc-19700101030959-ch2a6r6ushvc2vfwxt7ehcjuplelwthr
  sql/sql_derived.cc             sp1f-sql_derived.cc-20020326130604-4qz6ovo2xa6w5eslbmcx76agmnyyvsfh
  sql/sql_expression_cache.cc    sql_expression_cache-20100710101008-oqtsrd0hav47cxxm-1
  sql/sql_expression_cache.h     sql_expression_cache-20100710101008-oqtsrd0hav47cxxm-2
  sql/sql_insert.cc              sp1f-sql_insert.cc-19700101030959-xgwqe5svnimxudzdcuitauljzz2zjk5g
  sql/sql_lex.cc                 sp1f-sql_lex.cc-19700101030959-4pizwlu5rqkti27gcwsvxkawq6bc2kph
  sql/sql_lex.h                  sp1f-sql_lex.h-19700101030959-sgldb2sooc7twtw5q7pgjx7qzqiaa3sn
  sql/sql_list.h                 sp1f-sql_list.h-19700101030959-hyddr5nvvtrgbk7llgnah4i4bf6ugspn
  sql/sql_parse.cc               sp1f-sql_parse.cc-19700101030959-ehcre3rwhv5l3mlxqhaxg36ujenxnrcd
  sql/sql_prepare.cc             sp1f-sql_prepare.cc-20020612210720-gtqjjiu7vpmfxb5xct2qke7urmqcabli
  sql/sql_select.cc              sp1f-sql_select.cc-19700101030959-egb7whpkh76zzvikycs5nsnuviu4fdlb
  sql/sql_select.h               sp1f-sql_select.h-19700101030959-oqegfxr76xlgmrzd6qlevonoibfnwzoz
  sql/sql_update.cc              sp1f-sql_update.cc-19700101030959-edlgskfuer2ylczbw2znrr5gzfefiyw7
  sql/sql_view.cc                sp1f-sql_view.cc-20040715221517-nw4p4mja6nzzlvwwhzfgfqb4umxqobe4
  sql/sql_yacc.yy                sp1f-sql_yacc.yy-19700101030959-wvn4qyy2drpmge7kaq3dysprbhlrv27j
  sql/table.h                    sp1f-table.h-19700101030959-dv72bajftxj5fbdjuajquappanuv2ija
  storage/maria/ma_bitmap.c      sp1f-ma_bitmap.c-20070118193810-dcdqg6iu32wkt3pqyio4lqdqmaff2m7g
  storage/maria/ma_blockrec.c    sp1f-ma_blockrec.c-20070118193810-5wtbfa4irhu4voa3diiuus5km2j6jvlv
  storage/maria/ma_blockrec.h    sp1f-ma_blockrec.h-20070118193810-dmnsyug4lezfuzknreqy4jntnozdnvsc
  storage/maria/ma_check.c       sp1f-ma_check.c-20060411134408-m5d5jao4sr32xsjjkig2uhdndqm5cgba
  storage/maria/ma_create.c      sp1f-ma_create.c-20060411134410-ozzigempkjj2kdgxfbasiwfjzwjejevd
  storage/maria/ma_loghandler.c  sp1f-ma_loghandler.c-20070202074129-utpzp3km4lrxldm2tdhejae2zy6zlmhq
  storage/maria/ma_open.c        sp1f-ma_open.c-20060411134425-47m3424sotlyyl5b3k5brotxm23ryffh
  storage/maria/maria_chk.c      sp1f-maria_chk.c-20060411134451-6qsrwbln6zdm4nv27ftocrv6iqdyhlti
  storage/maria/maria_def.h      sp1f-maria_def.h-20060411134454-urdx4joxwcwzxbmltpzejn53y2rgjs44
  storage/xtradb/os/os0file.c    os0file.c-20081201061010-zymrrwrczns2vrex-313
  storage/xtradb/os/os0sync.c    os0sync.c-20081201061010-zymrrwrczns2vrex-315
-------------- next part --------------

Diff too large for email (10874 lines, the limit is 2000).


More information about the commits mailing list