[Commits] Rev 3365: Merge MariaDB 5.3.6 into MariaDB 5.5. in http://bazaar.launchpad.net/~maria-captains/maria/5.5

knielsen at knielsen-hq.org knielsen at knielsen-hq.org
Mon Apr 9 17:51:41 EEST 2012


At http://bazaar.launchpad.net/~maria-captains/maria/5.5

------------------------------------------------------------
revno: 3365 [merge]
revision-id: knielsen at knielsen-hq.org-20120409145128-tmgb5rwd7bv3p1ij
parent: sergii at pisem.net-20120405135727-1kxtscd76rq6xw5o
parent: igor at askmonty.org-20120408002700-7o6ozsb5pw99pf80
committer: knielsen at knielsen-hq.org
branch nick: mariadb-5.5
timestamp: Mon 2012-04-09 16:51:28 +0200
message:
  Merge MariaDB 5.3.6 into MariaDB 5.5.
modified:
  include/m_ctype.h              sp1f-m_ctype.h-19700101030959-dsoy764fhlrdbb6tsjldsk3e5fohfai6
  mysql-test/r/csv.result        sp1f-csv.result-20040813035429-xygspmdjj5llofwnj6e4ahynqepuqyue
  mysql-test/r/derived_view.result derived_view.result-20100429210222-m2cev70na5t81kgl-1
  mysql-test/r/func_time.result  sp1f-func_time.result-20001228015633-voo54ouzgwctcbmk22zwazoev5os5o4x
  mysql-test/r/join_cache.result join_cache.result-20091221012827-jfu65h0x5bmixhh3-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/partition_innodb.result sp1f-partition_innodb.res-20060518171642-5muwpwnvtxepgop4yhgzzrv2xo2wjlps
  mysql-test/r/subselect.result  subselect_scache.res-20110713142423-t6lrgrizahbpk2co-2
  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/subselect_no_mat.result subselect_no_mat.res-20100117143924-hut18sl9k2c7qdj8-1
  mysql-test/r/subselect_no_scache.result sp1f-subselect.result-20020512204640-zgegcsgavnfd7t7eyrf7ibuqomsw7uzo
  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,innodb_plugin.rdiff subselect_sj2_jcl6in-20120207142131-c8coyq1dzhk9b3hp-4
  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/subselect_sj_nonmerged.result subselect_sj_nonmerg-20110509190955-qez8cl79n7kmj030-1
  mysql-test/r/view.result       sp1f-view.result-20040715221517-nqk3l34grrhprjiitidhfjyjqlgh6a5v
  mysql-test/suite/binlog/t/binlog_stm_unsafe_warning.test binlog_stm_unsafe_wa-20090627130655-dgww8l4zomxa6h9l-3
  mysql-test/t/csv.test          sp1f-csv.test-20040813035429-r4segxdqrdhxsixrtpgiksyj6dmyiylv
  mysql-test/t/derived_view.test derived_view.test-20100429210209-ex88ainrb3oc2d4n-1
  mysql-test/t/join_outer.test   sp1f-join_outer.test-20001228015636-himrcptylaquy6l5d7pl7pawom3ytmtw
  mysql-test/t/subselect_sj2.test subselect_sj2.test-20100117143932-vxp9ugyy3s0mdo5j-1
  mysql-test/t/view.test         sp1f-view.test-20040715221517-2kxb7l4itrpl4mw266xe5gby4vftru3z
  scripts/mysql_install_db.sh    sp1f-mysql_install_db.sh-19700101030959-4m5n7i4aoib6psuxshrwl3qhkibxg7bp
  sql/item.cc                    sp1f-item.cc-19700101030959-u7hxqopwpfly4kf5ctlyk2dvrq4l3dhn
  sql/item.h                     sp1f-item.h-19700101030959-rrkb43htudd62batmoteashkebcwykpa
  sql/item_subselect.cc          sp1f-item_subselect.cc-20020512204640-qep43aqhsfrwkqmrobni6czc3fqj36oo
  sql/item_subselect.h           sp1f-item_subselect.h-20020512204640-qdg77wil56cxyhtc2bjjdrppxq3wqgh3
  sql/item_timefunc.cc           sp1f-item_timefunc.cc-19700101030959-rvvlgmw5b4ewpuuxuntrkiqimyrr5sw2
  sql/my_decimal.h               sp1f-my_decimal.h-20050208224937-z6shzy3pf5uyso4mvtc2f6pckjzfeg5f
  sql/opt_subselect.cc           opt_subselect.cc-20100215190428-nekkl8wisp0k6nlk-1
  sql/password.c                 sp1f-password.c-19700101030959-hyqrqz6vp4g26qbqvd4fq6z2ecdiqerx
  sql/protocol.cc                sp1f-net_pkg.cc-19700101030959-7izj6xxqwgfgxuikg6t24dhcwdedbl6i
  sql/rpl_rli.h                  sp1f-rpl_rli.h-20051222053448-bte4b72jikihtk3zbn5jyj2vbiawtwgc
  sql/sql_base.cc                sp1f-sql_base.cc-19700101030959-w7tul2gb2n4jzayjwlslj3ybmf3uhk6a
  sql/sql_cache.cc               sp1f-sql_cache.cc-19700101030959-74bsqwcnhboovijsogcenqana5inu6wo
  sql/sql_list.h                 sp1f-sql_list.h-19700101030959-hyddr5nvvtrgbk7llgnah4i4bf6ugspn
  sql/sql_select.cc              sp1f-sql_select.cc-19700101030959-egb7whpkh76zzvikycs5nsnuviu4fdlb
  sql/table.cc                   sp1f-table.cc-19700101030959-nsxtem2adyqzwe6nz4cgrpcmts3o54v7
  sql/table.h                    sp1f-table.h-19700101030959-dv72bajftxj5fbdjuajquappanuv2ija
  sql/unireg.h                   sp1f-unireg.h-19700101030959-6vhptb2vfyo4mcjkgdm3n5uw6u64czfo
  storage/csv/ha_tina.cc         sp1f-ha_tina.cc-20040813035429-5pwcme2ehkkuei6gu6ueo4tfldeeyw7l
  storage/csv/ha_tina.h          sp1f-ha_tina.h-20040813035430-sy73tmu2k4ln7oqqdk4ggkjrc75d2x3u
  storage/heap/hp_write.c        sp1f-hp_write.c-19700101030959-fyft5higet4kliqpr6vywernwiypjfzr
  storage/myisam/ft_nlq_search.c sp1f-ft_nlq_search.c-20010411110351-a7dhoojgfpsydi5k4qawswaatmakqe7b
  storage/myisam/mi_check.c      sp1f-mi_check.c-19700101030959-yzbhnjgzcmqdyj4zz5codhkkw5eedp6f
  strings/ctype-ucs2.c           sp1f-ctypeucs2.c-20030521102942-3fr4x6ti6jw6vqwdh7byhlxpu6oivdnn
  strings/ctype-utf8.c           sp1f-ctypeutf8.c-20020328133143-7ldgrkcon3ejrongwc7hy4m63qddjsal
  strings/decimal.c              sp1f-decimal.c-20041018120639-qqm4oeadwhbdhuxgwlc657il4tu44n6m

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


More information about the commits mailing list