[Commits] Rev 3592: Merge MariaDB 5.1.66 -> 5.2 -> 5.3 in file:///home/tsk/mprog/src/5.3-merge/

timour at askmonty.org timour at askmonty.org
Thu Nov 8 10:50:49 EET 2012


At file:///home/tsk/mprog/src/5.3-merge/

------------------------------------------------------------
revno: 3592 [merge]
revision-id: timour at askmonty.org-20121108085023-fg359nwt3bnmoddq
parent: igor at askmonty.org-20121102225916-g7s6hod36vdqckne
parent: timour at askmonty.org-20121107190719-k9tzynzzqbrkn8wy
committer: timour at askmonty.org
branch nick: 5.3-merge
timestamp: Thu 2012-11-08 10:50:23 +0200
message:
  Merge MariaDB 5.1.66 -> 5.2 -> 5.3
removed:
  extra/yassl/taocrypt/src/crypto.cpp sp1f-crypto.cpp-20060927122942-jhqjrntneclhxupnrtw2bsyttxycbtfa
  storage/xtradb/handler/innodb_patch_info.h innodb_patch_info.h-20081206234022-hep6ryfeacyr0572-1
added:
  mysql-test/suite/federated/include/ mysqltestsuitefedera-20120725083005-v19l682pq0xix0cu-1
  mysql-test/suite/innodb_plugin/r/innodb_information_schema_buffer.result innodb_information_s-20120719095748-xlgfshffy8rfn1b3-1
  mysql-test/suite/innodb_plugin/t/innodb_information_schema_buffer.test innodb_information_s-20120719063750-hzxuv5y7t2sx0kxv-1
  storage/xtradb/include/log0online.h log0online.h-20121101140612-551l3gqnap11a89q-1
  storage/xtradb/log/log0online.c log0online.c-20121101140612-551l3gqnap11a89q-2
renamed:
  mysql-test/suite/federated/federated.inc => mysql-test/suite/federated/include/federated.inc sp1f-federated.inc-20050715234236-7cak5zlq4fbqk4syuamsude7yrayh4ym
  mysql-test/suite/federated/federated_cleanup.inc => mysql-test/suite/federated/include/federated_cleanup.inc sp1f-federated_cleanup.in-20050715234237-umi6dcbw4iddewrgdfttonz62cg7io35
modified:
  CMakeLists.txt                 sp1f-cmakelists.txt-20060831175236-433hkm7nrqfjbwios4ancgytabw354nr
  Docs/INSTALL-BINARY            sp1f-installbinary-20071102002932-lm64vo6qp4t3tz7t2edp2mrg5udn2xsy
  client/mysql.cc                sp1f-mysql.cc-19700101030959-5sipizk7ehvbsi3tywrkdords5qy5zdl
  client/mysql_upgrade.c         sp1f-mysql_upgrade.c-20060428040559-3xcugp4nhhb6qfwfacoqw3d4ibgbeboz
  client/mysqladmin.cc           sp1f-mysqladmin.c-19700101030959-ud6encjcx2oypzvp7ptmojbi3xdos2fs
  client/mysqlbinlog.cc          sp1f-mysqlbinlog.cc-19700101030959-b3vgyo47ljent5mhbyj6ik33bi4bukad
  client/mysqlcheck.c            sp1f-mysqlcheck.c-20010419220847-mlhe2ixwl5ajjyneyciytsdsis3iujhl
  client/mysqldump.c             sp1f-mysqldump.c-19700101030959-thxq2iabzu3yo5snymsubfeclf7v5rac
  client/mysqlimport.c           sp1f-mysqlimport.c-19700101030959-m6nmuvl5kbp2qmdqtmu5mxafegtn7ipv
  client/mysqlshow.c             sp1f-mysqlshow.c-19700101030959-b6rjdpnvma7hacca2ibkkibowbi4hulk
  client/mysqlslap.c             sp1f-mysqlslap.c-20051130000206-7t375hf5mtlqof5xd4nj76yckxvxykhv
  client/mysqltest.cc            sp1f-mysqltest.c-20001010065317-ix4zw26srlev7yugcz455ux22zwyynyf
  client/sql_string.h            sp1f-sql_string.h-19700101030959-oscd4vjvtuwjf22oosfpfmvc2f3km2dx
  extra/perror.c                 sp1f-perror.c-19700101030959-chqjfrsdcoaezse75ogqywl264efjt3v
  extra/yassl/src/ssl.cpp        sp1f-ssl.cpp-20050428132310-dxnfnbmwz6rpnkj4agjb5nvfhhg345nq
  extra/yassl/taocrypt/src/Makefile.am sp1f-makefile.am-20050428132317-n6as7nf4jxpgraczrckxwabzeylmdwk4
  include/welcome_copyright_notice.h welcome_copyright_no-20101005135656-p7fnkc5dqg336mkn-1
  mysql-test/Makefile.am         sp1f-makefile.am-20001206082022-36vvdlhec52v4kcxab5ees7yomxvj4dl
  mysql-test/r/information_schema.result sp1f-information_schema.r-20041113105544-waoxa2fjjsicturpothmjmi6jc3yrovn
  mysql-test/r/information_schema_all_engines.result information_schema_a-20090408133348-au36idguotknighe-2
  mysql-test/r/innodb.result     innodb.result-20081201061010-zymrrwrczns2vrex-298
  mysql-test/r/innodb_no_mrricp.result innodb_no_mrricp.res-20110708144518-pn86vcqpp0dnsndk-1
  mysql-test/r/openssl_1.result  sp1f-ssl.result-20010831211351-xa6w74zno32dlg3iwugerlalsvrsq5hn
  mysql-test/r/subselect4.result subselect4.result-20090903150316-1sul3u8k29ooxm3r-2
  mysql-test/suite/federated/federated_archive.test sp1f-federated_archive.te-20050902184012-ntkrqr6yhmpxn3z3zjdwrsqv6y2k4dj4
  mysql-test/suite/federated/federated_bug_13118.test sp1f-federated_bug_13118.-20050916231733-s6sn7sacgnfyblqgs5kftws636t3oxik
  mysql-test/suite/federated/federated_bug_25714.test sp1f-federated_bug_25714.-20070724063540-o64ivn4wawpbeo67hvs4rklm44kx37nu
  mysql-test/suite/federated/federated_bug_32426.test federated_bug_32426.-20100818073917-70shrxkcz9jcp3bp-2
  mysql-test/suite/federated/federated_bug_35333.test federated_bug_35333.-20101130044345-6iy956b10epshtep-1
  mysql-test/suite/federated/federated_bug_585688.test federated_bug_585688-20110210203420-2syulkl42au7ndcp-2
  mysql-test/suite/federated/federated_debug.test federated_debug.test-20090930202805-kt19apxdz61tx0ln-1
  mysql-test/suite/federated/federated_innodb.test sp1f-federated_innodb.tes-20070628230259-ltfvjsjq24lq46yxq3s52xbsrtecrmm3
  mysql-test/suite/federated/federated_partition.test federated_partition.-20110210203420-2syulkl42au7ndcp-5
  mysql-test/suite/federated/federated_server.test sp1f-federated_server.tes-20061202004730-idhp5qb6ntspupkz2wftb5aguipv27kk
  mysql-test/suite/federated/federated_transactions.test sp1f-federated_transactio-20051109135140-zf5q2d5zwjjbj7gcwinjfct37x4uio2n
  mysql-test/suite/federated/federatedx.test sp1f-federated.test-20041211200119-aht6hujozcouca6joz5eaiq55jk6psb5
  mysql-test/suite/funcs_1/r/is_tables_is.result sp1f-is_tables_is.result-20080307163304-6xl5vbegso6wet3dzoehxb645vntxpig
  mysql-test/suite/innodb/r/innodb_misc1.result innodb_misc1.result-20100427060759-ki8xd97303uicinf-1
  mysql-test/suite/innodb_plugin/r/innodb-index.result 1414 at 16c675df-0fcb-4bc9-8058-dcc011a37293:branches%2Fzip%2Fmysql-test%2Finnodb-index.result
  mysql-test/suite/innodb_plugin/r/innodb-zip.result 2252 at 16c675df-0fcb-4bc9-8058-dcc011a37293:branches%2Fzip%2Fmysql-test%2Finnodb-zip.result
  mysql-test/suite/innodb_plugin/r/innodb.result 2 at 16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Fmysql-test%2Finnodb.result
  mysql-test/suite/innodb_plugin/r/innodb_bug53591.result innodb_bug53591.resu-20100512103833-7at6gr2zte1ofmjs-1
  mysql-test/suite/innodb_plugin/r/innodb_misc1.result innodb_misc1.result-20111025152535-ocd6o0bt010mu71d-1
  mysql-test/t/openssl_1.test    sp1f-ssl.test-20010831211355-mk47pipvythsqcor32yidzoopgdewdo6
  scripts/mysql_secure_installation.pl.in sp1f-mysql_secure_install-20071228215050-nnco3kgp33fxs7ja6zdy6xh56zszi2cc
  scripts/mysql_secure_installation.sh sp1f-mysql_secure_install-20020609041239-b4zztmtqycjs24aubuhwun6np5wuuesy
  sql/filesort.cc                sp1f-filesort.cc-19700101030959-mfm2vmdgqqru7emm2meeecleb2q3zdso
  sql/gen_lex_hash.cc            sp1f-gen_lex_hash.cc-19700101030959-ihtnj4jrxjs2tzorsl4bywh4hmrzhz4n
  sql/ha_partition.cc            sp1f-ha_partition.cc-20050718113037-eoky4qluumb5dmdyg5z6n2fvdkgutxms
  sql/ha_partition.h             sp1f-ha_partition.h-20050718113038-4xxwqkuu2xgxqtrwfbc43zgfyfcwzjsq
  sql/handler.cc                 sp1f-handler.cc-19700101030959-ta6zfrlbxzucylciyro3musjsdpocrdh
  sql/item_strfunc.cc            sp1f-item_strfunc.cc-19700101030959-yl2pwnrngmla3nmlgiuiwrztx3iu4ffl
  sql/item_subselect.cc          sp1f-item_subselect.cc-20020512204640-qep43aqhsfrwkqmrobni6czc3fqj36oo
  sql/mysqld.cc                  sp1f-mysqld.cc-19700101030959-zpswdvekpvixxzxf7gdtofzel7nywtfj
  sql/share/charsets/Index.xml   sp1f-index.xml-20030103103530-5pd7ad4tu3otejnum6ecdnadu4n3jb3b
  sql/spatial.cc                 sp1f-spatial.cc-20020222112439-yecm64geoygpvzrlc2mg7hdtbvtlmhoe
  sql/spatial.h                  sp1f-spatial.h-20020222112440-72iyz2ld6nl3qbitdm4dorewo3urjci7
  sql/sql_prepare.cc             sp1f-sql_prepare.cc-20020612210720-gtqjjiu7vpmfxb5xct2qke7urmqcabli
  sql/sql_select.cc              sp1f-sql_select.cc-19700101030959-egb7whpkh76zzvikycs5nsnuviu4fdlb
  sql/sql_show.cc                sp1f-sql_show.cc-19700101030959-umlljfnpplg452h7reeyqr4xnbmlkvfj
  sql/sql_string.h               sp1f-sql_string.h-19700101030959-nogsoxwv222e4vm4toic7cabeb4swajz
  storage/federated/ha_federated.cc sp1f-ha_federated.cc-20041211200120-gu52ex5sicbua5vtoocuki3ltllsvm2c
  storage/innobase/btr/btr0pcur.c 2 at cee13dc7-1704-0410-992b-c9b4543f1246:trunk%2Fbtr%2Fbtr0pcur.c
  storage/innodb_plugin/ChangeLog 2425 at 16c675df-0fcb-4bc9-8058-dcc011a37293:branches%2Fzip%2FChangeLog
  storage/innodb_plugin/btr/btr0btr.c 2 at 16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Fbtr%2Fbtr0btr.c
  storage/innodb_plugin/btr/btr0cur.c 2 at 16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Fbtr%2Fbtr0cur.c
  storage/innodb_plugin/btr/btr0pcur.c 2 at 16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Fbtr%2Fbtr0pcur.c
  storage/innodb_plugin/buf/buf0buf.c 2 at 16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Fbuf%2Fbuf0buf.c
  storage/innodb_plugin/handler/ha_innodb.cc 2 at 16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Fhandler%2Fha_innodb.cc
  storage/innodb_plugin/handler/i_s.cc 1864 at 16c675df-0fcb-4bc9-8058-dcc011a37293:branches%2Fzip%2Fhandler%2Fi_s.cc
  storage/innodb_plugin/handler/i_s.h 1864 at 16c675df-0fcb-4bc9-8058-dcc011a37293:branches%2Fzip%2Fhandler%2Fi_s.h
  storage/innodb_plugin/ibuf/ibuf0ibuf.c 2 at 16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Fibuf%2Fibuf0ibuf.c
  storage/innodb_plugin/include/buf0buf.h 2 at 16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Finclude%2Fbuf0buf.h
  storage/innodb_plugin/include/buf0buf.ic 2 at 16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Finclude%2Fbuf0buf.ic
  storage/innodb_plugin/include/fil0fil.h 2 at 16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Finclude%2Ffil0fil.h
  storage/innodb_plugin/include/log0log.h 2 at 16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Finclude%2Flog0log.h
  storage/innodb_plugin/include/univ.i 2 at 16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Finclude%2Funiv.i
  storage/innodb_plugin/page/page0cur.c 2 at 16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Fpage%2Fpage0cur.c
  storage/innodb_plugin/page/page0page.c 2 at 16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Fpage%2Fpage0page.c
  storage/innodb_plugin/row/row0ins.c 2 at 16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Frow%2Frow0ins.c
  storage/innodb_plugin/row/row0merge.c 1414 at 16c675df-0fcb-4bc9-8058-dcc011a37293:branches%2Fzip%2Frow%2Frow0merge.c
  storage/innodb_plugin/scripts/install_innodb_plugins.sql 2428 at 16c675df-0fcb-4bc9-8058-dcc011a37293:branches%2Fzip%2Fscripts%2Finstall_innodb_plugins.sql
  storage/innodb_plugin/scripts/install_innodb_plugins_win.sql 2951 at 16c675df-0fcb-4bc9-8058-dcc011a37293:branches%2Fzip%2Fscripts%2Finstall_innodb_plugins_win.sql
  storage/xtradb/CMakeLists.txt  cmakelists.txt-20081201061010-zymrrwrczns2vrex-1
  storage/xtradb/ChangeLog       changelog-20081201061010-zymrrwrczns2vrex-3
  storage/xtradb/Makefile.am     makefile.am-20081201061010-zymrrwrczns2vrex-4
  storage/xtradb/btr/btr0btr.c   btr0btr.c-20081201061010-zymrrwrczns2vrex-44
  storage/xtradb/btr/btr0cur.c   btr0cur.c-20081201061010-zymrrwrczns2vrex-45
  storage/xtradb/btr/btr0pcur.c  btr0pcur.c-20081201061010-zymrrwrczns2vrex-46
  storage/xtradb/buf/buf0buf.c   buf0buf.c-20081201061010-zymrrwrczns2vrex-49
  storage/xtradb/buf/buf0lru.c   buf0lru.c-20081201061010-zymrrwrczns2vrex-51
  storage/xtradb/dict/dict0boot.c dict0boot.c-20081201061010-zymrrwrczns2vrex-55
  storage/xtradb/dict/dict0dict.c dict0dict.c-20081201061010-zymrrwrczns2vrex-57
  storage/xtradb/dict/dict0load.c dict0load.c-20081201061010-zymrrwrczns2vrex-58
  storage/xtradb/fil/fil0fil.c   fil0fil.c-20081201061010-zymrrwrczns2vrex-63
  storage/xtradb/handler/ha_innodb.cc ha_innodb.cc-20081201061010-zymrrwrczns2vrex-70
  storage/xtradb/handler/ha_innodb.h ha_innodb.h-20081201061010-zymrrwrczns2vrex-71
  storage/xtradb/handler/handler0alter.cc handler0alter.cc-20081201061010-zymrrwrczns2vrex-72
  storage/xtradb/handler/i_s.cc  i_s.cc-20081201061010-zymrrwrczns2vrex-73
  storage/xtradb/handler/i_s.h   i_s.h-20081201061010-zymrrwrczns2vrex-74
  storage/xtradb/ibuf/ibuf0ibuf.c ibuf0ibuf.c-20081201061010-zymrrwrczns2vrex-76
  storage/xtradb/include/buf0buf.h buf0buf.h-20081201061010-zymrrwrczns2vrex-88
  storage/xtradb/include/buf0buf.ic buf0buf.ic-20081201061010-zymrrwrczns2vrex-89
  storage/xtradb/include/buf0lru.h buf0lru.h-20081201061010-zymrrwrczns2vrex-92
  storage/xtradb/include/dict0boot.h dict0boot.h-20081201061010-zymrrwrczns2vrex-102
  storage/xtradb/include/fil0fil.h fil0fil.h-20081201061010-zymrrwrczns2vrex-119
  storage/xtradb/include/log0log.h log0log.h-20081201061010-zymrrwrczns2vrex-143
  storage/xtradb/include/log0recv.h log0recv.h-20081201061010-zymrrwrczns2vrex-145
  storage/xtradb/include/os0file.h os0file.h-20081201061010-zymrrwrczns2vrex-161
  storage/xtradb/include/os0sync.h os0sync.h-20081201061010-zymrrwrczns2vrex-164
  storage/xtradb/include/srv0srv.h srv0srv.h-20081201061010-zymrrwrczns2vrex-219
  storage/xtradb/include/univ.i  univ.i-20081201061010-zymrrwrczns2vrex-248
  storage/xtradb/include/ut0rbt.h ut0rbt.h-20100803104749-2zyl6a1rrwbkx3by-2
  storage/xtradb/log/log0log.c   log0log.c-20081201061010-zymrrwrczns2vrex-270
  storage/xtradb/log/log0recv.c  log0recv.c-20081201061010-zymrrwrczns2vrex-271
  storage/xtradb/os/os0file.c    os0file.c-20081201061010-zymrrwrczns2vrex-313
  storage/xtradb/page/page0cur.c page0cur.c-20081201061010-zymrrwrczns2vrex-317
  storage/xtradb/page/page0page.c page0page.c-20081201061010-zymrrwrczns2vrex-318
  storage/xtradb/plug.in         plug.in-20081201061010-zymrrwrczns2vrex-31
  storage/xtradb/row/row0ins.c   row0ins.c-20081201061010-zymrrwrczns2vrex-334
  storage/xtradb/row/row0merge.c row0merge.c-20081201061010-zymrrwrczns2vrex-335
  storage/xtradb/row/row0mysql.c row0mysql.c-20081201061010-zymrrwrczns2vrex-336
  storage/xtradb/row/row0vers.c  row0vers.c-20081201061010-zymrrwrczns2vrex-344
  storage/xtradb/scripts/install_innodb_plugins.sql install_innodb_plugi-20081201061010-zymrrwrczns2vrex-345
  storage/xtradb/scripts/install_innodb_plugins_win.sql install_innodb_plugi-20081203050234-edoolglm28lyejuc-14
  storage/xtradb/srv/srv0srv.c   srv0srv.c-20081201061010-zymrrwrczns2vrex-347
  storage/xtradb/srv/srv0start.c srv0start.c-20081201061010-zymrrwrczns2vrex-348
  storage/xtradb/sync/sync0arr.c sync0arr.c-20081201061010-zymrrwrczns2vrex-349
  storage/xtradb/ut/ut0rbt.c     ut0rbt.c-20100803104749-2zyl6a1rrwbkx3by-3
  support-files/mysql.spec.sh    sp1f-mysql.spec.sh-19700101030959-man6e3acwxvf62bdqvkpcpsvdtokf3ff
  vio/viosslfactories.c          sp1f-viosslfactories.c-20010520120431-walfvbsc6adzg7cj5g6xl3r73ycxspmb
-------------- next part --------------

Diff too large for email (12023 lines, the limit is 10000).


More information about the commits mailing list