[Commits] Rev 2885: Merge MariaDB 5.1->5.2 in http://bazaar.launchpad.net/~maria-captains/maria/5.1

knielsen at knielsen-hq.org knielsen at knielsen-hq.org
Fri Nov 19 23:33:55 EET 2010


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

------------------------------------------------------------
revno: 2885 [merge]
revision-id: knielsen at knielsen-hq.org-20101119213347-nrsmmo52eh73mb51
parent: sergii at pisem.net-20101111110214-rqvh0jc62el4b1j6
parent: sanja at askmonty.org-20101118141011-gth6b6pa0w9lyu1b
committer: knielsen at knielsen-hq.org
branch nick: mariadb-5.2
timestamp: Fri 2010-11-19 22:33:47 +0100
message:
  Merge MariaDB 5.1->5.2
removed:
  mysql-test/t/information_schema_all_engines-master.opt information_schema_a-20100912121143-e9z4lt00j4xla07o-1
added:
  mysql-test/t/information_schema_all_engines-master.opt information_schema_a-20101108112450-q9d06ov8v0714149-1
  storage/maria/maria_dump_log.c maria_dump_log.c-20101117122222-ik4mpxpw0aunkvnv-1
modified:
  client/Makefile.am             sp1f-makefile.am-19700101030959-zpaig4zjwqhmsob3ypilmrcrkq7pu6gf
  config/ac-macros/plugins.m4    sp1f-plugins.m4-20060413204924-cltp6uagmyygsgdno6od3mamfizdhk3m
  configure.in                   sp1f-configure.in-19700101030959-mgdpoxtnh2ewmvusvfpkreuhwvffkcjw
  dbug/Makefile.am               sp1f-makefile.am-19700101030959-oxqcphdkxxekpdla7yotor6pc55n3ylk
  extra/Makefile.am              sp1f-makefile.am-19700101030959-6ar5huea7wfhv7gzwizsa5dchtxnjyzm
  extra/replace.c                sp1f-replace.c-19700101030959-xyfwhacurfg4s5z5lmbop57j6cglz57w
  include/maria.h                sp1f-maria.h-20060411134400-ylx7cem3pcdf2jg6it2tuutxyzoljzvv
  include/my_sys.h               sp1f-my_sys.h-19700101030959-lyllvna5vzqfcjnmlcrutgqocylhtb54
  include/myisam.h               sp1f-myisam.h-19700101030959-2zv2wn7kuuvbyktuyfsitra6cl37h3mm
  include/myisamchk.h            sp1f-myisamchk.h-20060411134400-oxba7mdmuzv2d62tlze6mrs5tpbmhrzw
  libmysqld/Makefile.am          sp1f-makefile.am-20010411110351-26htpk3ynkyh7pkfvnshztqrxx3few4g
  libmysqld/examples/Makefile.am sp1f-makefile.am-20010917001549-tjd75vs2uksybsthoqfgfiou6behotrk
  mysys/Makefile.am              sp1f-makefile.am-19700101030959-36zaboyabq4ooqfc2jpion3pic7yhpgb
  mysys/my_redel.c               sp1f-my_redel.c-19700101030959-ki322j4p74mpkdbdsettqo2bh2y2ln2g
  mysys/my_uuid.c                sp1f-my_uuid.c-20071009180946-wypun6nqt33pvndknve5p4tq2cesvp3q
  regex/Makefile.am              sp1f-makefile.am-19700101030959-a4yiac5kdunf3etau4gv7epywfrjc6gl
  sql/Makefile.am                sp1f-makefile.am-19700101030959-xsjdiakci3nqcdd4xl4yomwdl5eo2f3q
  sql/handler.cc                 sp1f-handler.cc-19700101030959-ta6zfrlbxzucylciyro3musjsdpocrdh
  sql/handler.h                  sp1f-handler.h-19700101030959-mumq2hpilkpgxuf22ftyv5kbilysnzvn
  sql/item.h                     sp1f-item.h-19700101030959-rrkb43htudd62batmoteashkebcwykpa
  sql/item_func.cc               sp1f-item_func.cc-19700101030959-3wmsx76yvc25sroqpfrx2n77kqdxxn3y
  sql/mysql_priv.h               sp1f-mysql_priv.h-19700101030959-4fl65tqpop5zfgxaxkqotu2fa2ree5ci
  sql/mysqld.cc                  sp1f-mysqld.cc-19700101030959-zpswdvekpvixxzxf7gdtofzel7nywtfj
  sql/sp.cc                      sp1f-sp.cc-20021212121421-6xwuvxq5bku2b4yv655kp2e5gsvautd5
  sql/sql_show.cc                sp1f-sql_show.cc-19700101030959-umlljfnpplg452h7reeyqr4xnbmlkvfj
  storage/archive/Makefile.am    sp1f-makefile.am-20051223034959-islfgluff2lgwu6nqfxdcqg4xgjp757j
  storage/archive/plug.in        sp1f-plug.in-20060504211449-pwv4vitkowpzxwbmcduiughfj5qbxrye
  storage/blackhole/Makefile.am  sp1f-makefile.am-20060413204924-2kgi4jv6k2hwk5bqtinvpxi2nmp76byv
  storage/blackhole/plug.in      sp1f-plug.in-20060819003111-akkznupimzhxwxz4l3xi2cg47razrgnk
  storage/csv/Makefile.am        sp1f-makefile.am-20051221181830-k6kkesbzq75h47wmm4xlifsl6l4k7stv
  storage/csv/plug.in            sp1f-plug.in-20060819041916-kdn4xmd7ioge3x26mjogplwr7j4ejr7l
  storage/example/Makefile.am    sp1f-makefile.am-20051221181830-qhpudfvq7qccif4djsijfcwl2l4igz4a
  storage/federated/Makefile.am  sp1f-makefile.am-20060819041916-ilwys7ffnla6e6h5gtccrx6efgfjprox
  storage/federated/plug.in      sp1f-plug.in-20060819041916-p5uvuyd4fqati3b55alx3ll5m5bbzqso
  storage/federatedx/Makefile.am makefile.am-20091029224633-m824ql737a2j6q5a-9
  storage/federatedx/plug.in     plug.in-20091029224734-rn5zpk06uoa5wzwa-2
  storage/heap/Makefile.am       sp1f-makefile.am-19700101030959-2ygqu2tsgo63isjcjdjkek7ov7nc5ofh
  storage/heap/plug.in           sp1f-plug.in-20060819003111-v5bcfd6swshiifw3uini7yfm6bzcdva2
  storage/innobase/Makefile.am   2 at cee13dc7-1704-0410-992b-c9b4543f1246:trunk%2FMakefile.am
  storage/innobase/plug.in.disabled 772 at cee13dc7-1704-0410-992b-c9b4543f1246:trunk%2Fplug.in
  storage/innodb_plugin/Makefile.am 2 at 16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2FMakefile.am
  storage/maria/CMakeLists.txt   sp1f-cmakelists.txt-20060904145307-qtvi5bxnxyt7nzs4gtpsyte5vv3fwm2i
  storage/maria/Makefile.am      sp1f-makefile.am-20060411134406-6db4z5hflzf4umyeq7uyzqqoresj2gtb
  storage/maria/ha_maria.cc      sp1f-ha_maria.cc-20060411134405-dmngb4v5x5fxlxhff527ud3etiutxuxk
  storage/maria/ma_bitmap.c      sp1f-ma_bitmap.c-20070118193810-dcdqg6iu32wkt3pqyio4lqdqmaff2m7g
  storage/maria/ma_check.c       sp1f-ma_check.c-20060411134408-m5d5jao4sr32xsjjkig2uhdndqm5cgba
  storage/maria/ma_loghandler.c  sp1f-ma_loghandler.c-20070202074129-utpzp3km4lrxldm2tdhejae2zy6zlmhq
  storage/maria/ma_loghandler.h  sp1f-ma_loghandler.h-20070202074129-s3537sryeljtck6bbguozuod72mp2gd4
  storage/maria/ma_pagecache.c   sp1f-mf_pagecache.c-20060706081022-sq6xnd367a2snwk4dup6yokn4paw7b5e
  storage/maria/maria_chk.c      sp1f-maria_chk.c-20060411134451-6qsrwbln6zdm4nv27ftocrv6iqdyhlti
  storage/maria/maria_pack.c     sp1f-maria_pack.c-20060411134456-sgjojyjckwwdkgj4uds4zj6wxmiyerel
  storage/maria/plug.in          sp1f-plug.in-20060907150715-znaalnem4ft2ccmqjfjw6ddw7ogugezm
  storage/myisam/Makefile.am     sp1f-makefile.am-19700101030959-tbashf4sdwyuiowthmvv4icv3ffl3beg
  storage/myisam/ha_myisam.cc    sp1f-ha_myisam.cc-19700101030959-7xzssylbn7zfz3nupnsw43wws6xlltsu
  storage/myisam/ha_myisam.h     sp1f-ha_myisam.h-19700101030959-6vqsvuthz3pkfqplhfwzqrdryoixszpn
  storage/myisam/mi_check.c      sp1f-mi_check.c-19700101030959-yzbhnjgzcmqdyj4zz5codhkkw5eedp6f
  storage/myisam/myisamchk.c     sp1f-myisamchk.c-19700101030959-hdnrqowbdb3ujo3qgjtzs6lgogwckvgc
  storage/myisam/myisampack.c    sp1f-myisampack.c-19700101030959-vdw5l4escwvefl6lpsh5ra6me55fwysp
  storage/myisam/plug.in         sp1f-plug.in-20060819003111-3f4zrvs6ruaayh2jzqsd6wsmd4b6ecqk
  storage/myisammrg/Makefile.am  sp1f-makefile.am-19700101030959-h6jpmvtyiorpa2bs4a7uig6afvg4u6zk
  storage/myisammrg/plug.in      sp1f-plug.in-20060819003111-nppdzpisbxr5phak42twxmv6big4vgv2
  storage/oqgraph/plug.in        plug.in-20091109115125-39rbuqeoqlrz4bux-15
  storage/pbxt/plug.in           plug.in-20090326121724-x683v32twzr3fi0y-9
  storage/pbxt/src/Makefile.am   makefile.am-20090326121724-x683v32twzr3fi0y-13
  storage/sphinx/Makefile.am     makefile.am-20100709115352-b84ypltib7085egy-3
  storage/sphinx/plug.in         plug.in-20100709115352-b84ypltib7085egy-8
  storage/xtradb/Makefile.am     makefile.am-20081201061010-zymrrwrczns2vrex-4
  storage/xtradb/include/srv0srv.h srv0srv.h-20081201061010-zymrrwrczns2vrex-219
  storage/xtradb/log/log0log.c   log0log.c-20081201061010-zymrrwrczns2vrex-270
  storage/xtradb/plug.in         plug.in-20081201061010-zymrrwrczns2vrex-31
  storage/xtradb/srv/srv0srv.c   srv0srv.c-20081201061010-zymrrwrczns2vrex-347
  strings/Makefile.am            sp1f-makefile.am-19700101030959-jfitkanzc3r4h2otoyaaprgqn7muf4ux
  unittest/unit.pl               sp1f-unit.pl-20060404161610-6fnxqoffmixufpbfvckzplkype54kc75
  vio/Makefile.am                sp1f-makefile.am-19700101030959-2gpdcwrvcp4bzgh22cql6xqcu22uxp3r

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


More information about the commits mailing list