[Commits] Rev 4471: 5.5 merge in lp:~maria-captains/maria/10.0

Sergei Golubchik serg at mariadb.org
Mon Nov 3 18:49:31 EET 2014


At lp:~maria-captains/maria/10.0

------------------------------------------------------------
revno: 4471 [merge]
revision-id: sergii at pisem.net-20141103164737-457hfby1eg82zol9
parent: bar at mnogosearch.org-20141101210809-63jvsw4vyjgcutwh
parent: sergii at pisem.net-20141102163302-8ukz7pi4mwsx89n0
committer: Sergei Golubchik <sergii at pisem.net>
branch nick: 10.0
timestamp: Mon 2014-11-03 17:47:37 +0100
message:
  5.5 merge
added:
  storage/tokudb/ft-index/locktree/tests/manager_parallel_locktree_get_release.cc locktree/tests/manager__parallel__locktree__get__release.cc at d377fcb8924e2f20f0111b2a05df10586a49a89c
  storage/tokudb/mysql-test/tokudb_bugs/r/db397_delete_trigger.result mysql-test/suite/tokudb.bugs/r/db397__delete__trigger.result at 388fda5e044a6acc16c0fcb6768c086e2baafea3
  storage/tokudb/mysql-test/tokudb_bugs/r/db397_insert_trigger.result mysql-test/suite/tokudb.bugs/r/db397__insert__trigger.result at 388fda5e044a6acc16c0fcb6768c086e2baafea3
  storage/tokudb/mysql-test/tokudb_bugs/r/db397_update_trigger.result mysql-test/suite/tokudb.bugs/r/db397__update__trigger.result at 388fda5e044a6acc16c0fcb6768c086e2baafea3
  storage/tokudb/mysql-test/tokudb_bugs/r/db739_insert.result mysql-test/suite/tokudb.bugs/r/db739__insert.result at 39fff5b02315dd11254c4fb0752fac8240a80e33
  storage/tokudb/mysql-test/tokudb_bugs/r/db739_replace.result mysql-test/suite/tokudb.bugs/r/db739__replace.result at 39fff5b02315dd11254c4fb0752fac8240a80e33
  storage/tokudb/mysql-test/tokudb_bugs/r/db739_upsert.result mysql-test/suite/tokudb.bugs/r/db739__upsert.result at 39fff5b02315dd11254c4fb0752fac8240a80e33
  storage/tokudb/mysql-test/tokudb_bugs/r/db743.result mysql-test/suite/tokudb.bugs/r/db743.result at 72f1b01f33ef6f2b7aa146650a7e005ca6f1415b
  storage/tokudb/mysql-test/tokudb_bugs/t/db397_delete_trigger.test mysql-test/suite/tokudb.bugs/t/db397__delete__trigger.test at 388fda5e044a6acc16c0fcb6768c086e2baafea3
  storage/tokudb/mysql-test/tokudb_bugs/t/db397_insert_trigger.test mysql-test/suite/tokudb.bugs/t/db397__insert__trigger.test at 388fda5e044a6acc16c0fcb6768c086e2baafea3
  storage/tokudb/mysql-test/tokudb_bugs/t/db397_update_trigger.test mysql-test/suite/tokudb.bugs/t/db397__update__trigger.test at 388fda5e044a6acc16c0fcb6768c086e2baafea3
  storage/tokudb/mysql-test/tokudb_bugs/t/db739_insert.test mysql-test/suite/tokudb.bugs/t/db739__insert.test at 39fff5b02315dd11254c4fb0752fac8240a80e33
  storage/tokudb/mysql-test/tokudb_bugs/t/db739_replace.test mysql-test/suite/tokudb.bugs/t/db739__replace.test at 39fff5b02315dd11254c4fb0752fac8240a80e33
  storage/tokudb/mysql-test/tokudb_bugs/t/db739_upsert.test mysql-test/suite/tokudb.bugs/t/db739__upsert.test at 39fff5b02315dd11254c4fb0752fac8240a80e33
  storage/tokudb/mysql-test/tokudb_bugs/t/db743.test mysql-test/suite/tokudb.bugs/t/db743.test at 72f1b01f33ef6f2b7aa146650a7e005ca6f1415b
modified:
  cmake/cpack_rpm.cmake          cpack_rpm.cmake-20120428083640-hs7ck2a4m93nbvcp-1
  mysql-test/mysql-test-run.pl   sp1f-mysqltestrun.pl-20041230152716-xjnn5ndv4rr4by6ijmj5a4ysubxc7qh3
  mysql-test/r/group_by.result   sp1f-group_by.result-20001228015633-bgjibbiwynctdjq73ms5muj5g6hfpv4d
  mysql-test/r/information_schema.result sp1f-information_schema.r-20041113105544-waoxa2fjjsicturpothmjmi6jc3yrovn
  mysql-test/r/processlist.result processlist.result-20130613143105-mmbbb0s961pyyk2p-1
  mysql-test/suite/innodb/t/innodb.test 1414 at 16c675df-0fcb-4bc9-8058-dcc011a37293:branches%2Fzip%2Fmysql-test%2Finnodb.test
  mysql-test/suite/innodb/t/innodb_information_schema.test 2037 at 16c675df-0fcb-4bc9-8058-dcc011a37293:branches%2Fzip%2Fmysql-test%2Finnodb_information_schema.test
  mysql-test/suite/rpl/t/rpl_show_slave_hosts.test rpl_show_slave_hosts-20091020030413-tms3d9h9t31t4gj0-2
  mysql-test/t/group_by.test     sp1f-group_by.test-20001228015636-5zwfyi7n5e5jsbyby7a7fvitybcefqwu
  mysql-test/t/information_schema.test sp1f-information_schema.t-20041113105545-lgutyhqnhpfgiswiwj2ykmjnolmsfq5h
  mysql-test/t/processlist.test  processlist.test-20130613143105-mmbbb0s961pyyk2p-2
  sql/sql_base.cc                sp1f-sql_base.cc-19700101030959-w7tul2gb2n4jzayjwlslj3ybmf3uhk6a
  sql/sql_parse.cc               sp1f-sql_parse.cc-19700101030959-ehcre3rwhv5l3mlxqhaxg36ujenxnrcd
  sql/sql_select.cc              sp1f-sql_select.cc-19700101030959-egb7whpkh76zzvikycs5nsnuviu4fdlb
  sql/sql_table.cc               sp1f-sql_table.cc-19700101030959-tzdkvgigezpuaxnldqh3fx2h7h2ggslu
  storage/tokudb/CMakeLists.txt  storage/tokudb/CMakeLists.txt at 5eba0d9d98d6c019fb6cc51df794ba26d47d796d
  storage/tokudb/README.md       README.md at 6df48f581dce49ab419fa850d8c190aee488aafd
  storage/tokudb/ft-index/cmake/merge_archives_unix.cmake.in cmake/merge__archives__unix.cmake.in at 54432727b79350fdedbd9c98180dd4b9b6dcafd7
  storage/tokudb/ft-index/cmake_modules/TokuMergeLibs.cmake cmake__modules/TokuMergeLibs.cmake at 54432727b79350fdedbd9c98180dd4b9b6dcafd7
  storage/tokudb/ft-index/cmake_modules/TokuSetupCompiler.cmake cmake__modules/TokuSetupCompiler.cmake at 32cd9ae5c06c4c1b01749ee89eb76ae4eb08761c
  storage/tokudb/ft-index/ft/cachetable/cachetable.cc ft/cachetable/cachetable.cc at 0d3340a51db55ad773447c368238080ce55b8678
  storage/tokudb/ft-index/ft/ft-flusher.cc ft/ft-flusher.cc at 9fbea5d8c9541ccd73f3bbe1a635a74f9c5cff37
  storage/tokudb/ft-index/ft/ft-ops.cc ft/ft-ops.cc at 9fbea5d8c9541ccd73f3bbe1a635a74f9c5cff37
  storage/tokudb/ft-index/ft/logger/logger.cc ft/logger/logger.cc at ae3082468b9bc3260ff2d12eeeac0c10bf38860d
  storage/tokudb/ft-index/ft/serialize/ft_node-serialize.cc ft/serialize/ft__node-serialize.cc at 949e3381b78d338ea0b2103671906ffe2c253493
  storage/tokudb/ft-index/ft/tests/CMakeLists.txt ft/tests/CMakeLists.txt at 75f2f01303f6ae5d45e6c0ddb6c0a3f9e2dea399
  storage/tokudb/ft-index/ft/txn/txn_manager.cc ft/txn/txn__manager.cc at 0d3340a51db55ad773447c368238080ce55b8678
  storage/tokudb/ft-index/ft/valgrind.suppressions ft/valgrind.suppressions at 75f2f01303f6ae5d45e6c0ddb6c0a3f9e2dea399
  storage/tokudb/ft-index/locktree/locktree.cc locktree/locktree.cc at 9e4b3509ecbba7c2d8b169b2feae007601d294c0
  storage/tokudb/ft-index/locktree/manager.cc locktree/manager.cc at 9e4b3509ecbba7c2d8b169b2feae007601d294c0
  storage/tokudb/ft-index/portability/tests/try-leak-lost.cc portability/tests/try-leak-lost.cc at 9fbea5d8c9541ccd73f3bbe1a635a74f9c5cff37
  storage/tokudb/ft-index/portability/tests/try-uninit.cc portability/tests/try-uninit.cc at 9fbea5d8c9541ccd73f3bbe1a635a74f9c5cff37
  storage/tokudb/ft-index/portability/toku_race_tools.h portability/toku__race__tools.h at 1f07a7d14a8e68f6fbd194ed32197bcfec4eabb3
  storage/tokudb/ft-index/scripts/run.stress-tests.py scripts/run.stress-tests.py at e9f6d5570274a42a9738df42810c4994fdee6256
  storage/tokudb/ft-index/src/tests/CMakeLists.txt src/tests/CMakeLists.txt at 32cd9ae5c06c4c1b01749ee89eb76ae4eb08761c
  storage/tokudb/ft-index/src/tests/helgrind.suppressions src/tests/helgrind.suppressions at 492c80980d8f841fc5e656f7cafab79b92a1e62f
  storage/tokudb/ft-index/src/tests/test_insert_unique.cc src/tests/test__insert__unique.cc at db1065e7845b7d64271d60165c17b909509db2c2
  storage/tokudb/ft-index/src/tests/test_keylen_diff.cc src/tests/test__keylen__diff.cc at 7ce7ec3b49b8ebea1a03ccf2e908f56dd7d9166c
  storage/tokudb/ha_tokudb.cc    storage/tokudb/ha__tokudb.cc at 9e4247cc874c0a216ecd68533e59ecd43c35aa63
  storage/tokudb/ha_tokudb.h     storage/tokudb/ha__tokudb.h at 9e4247cc874c0a216ecd68533e59ecd43c35aa63
  storage/tokudb/ha_tokudb_admin.cc storage/tokudb/ha__tokudb__admin.cc at 224979c9618c519d79723b6375ef9d3890b64488
  storage/tokudb/hatoku_defines.h storage/tokudb/hatoku__defines.h at 840d7774bb435ce52ab01d6c2fe71bd7a92ce576
  storage/tokudb/hatoku_hton.cc  storage/tokudb/hatoku__hton.cc at c47a065915757df6e8f7fd33f544d0660bc86ec8
  storage/tokudb/hatoku_hton.h   storage/tokudb/hatoku__hton.h at c47a065915757df6e8f7fd33f544d0660bc86ec8
  storage/tokudb/mysql-test/tokudb/r/bf_create_select.result mysql-test/suite/tokudb/r/bf__create__select.result at 7b061ff6a31120871deefb634c85449a422ed159
  storage/tokudb/mysql-test/tokudb/r/bf_create_select_hash_part.result mysql-test/suite/tokudb/r/bf__create__select__hash__part.result at c92be4c8b5251c2128d29246a7a4f9775b8d97b5
  storage/tokudb/mysql-test/tokudb/r/bf_create_select_range_part.result mysql-test/suite/tokudb/r/bf__create__select__range__part.result at c92be4c8b5251c2128d29246a7a4f9775b8d97b5
  storage/tokudb/mysql-test/tokudb/r/bf_create_temp_select.result mysql-test/suite/tokudb/r/bf__create__temp__select.result at 7b061ff6a31120871deefb634c85449a422ed159
  storage/tokudb/mysql-test/tokudb/r/bf_insert_select.result mysql-test/suite/tokudb/r/bf__insert__select.result at 7b061ff6a31120871deefb634c85449a422ed159
  storage/tokudb/mysql-test/tokudb/r/bf_insert_select_dup_key.result mysql-test/suite/tokudb/r/bf__insert__select__dup__key.result at 7b061ff6a31120871deefb634c85449a422ed159
  storage/tokudb/mysql-test/tokudb/r/bf_replace_select.result mysql-test/suite/tokudb/r/bf__replace__select.result at 7b061ff6a31120871deefb634c85449a422ed159
  storage/tokudb/mysql-test/tokudb/r/bf_select_range_part.result mysql-test/suite/tokudb/r/bf__select__range__part.result at 7b061ff6a31120871deefb634c85449a422ed159
  storage/tokudb/mysql-test/tokudb/t/bf_create_select.test mysql-test/suite/tokudb/t/bf__create__select.test at 7b061ff6a31120871deefb634c85449a422ed159
  storage/tokudb/mysql-test/tokudb/t/bf_create_select_hash_part.test mysql-test/suite/tokudb/t/bf__create__select__hash__part.test at c92be4c8b5251c2128d29246a7a4f9775b8d97b5
  storage/tokudb/mysql-test/tokudb/t/bf_create_select_range_part.test mysql-test/suite/tokudb/t/bf__create__select__range__part.test at c92be4c8b5251c2128d29246a7a4f9775b8d97b5
  storage/tokudb/mysql-test/tokudb/t/bf_create_temp_select.test mysql-test/suite/tokudb/t/bf__create__temp__select.test at 7b061ff6a31120871deefb634c85449a422ed159
  storage/tokudb/mysql-test/tokudb/t/bf_delete.test mysql-test/suite/tokudb/t/bf__delete.test at 7b061ff6a31120871deefb634c85449a422ed159
  storage/tokudb/mysql-test/tokudb/t/bf_insert_select.test mysql-test/suite/tokudb/t/bf__insert__select.test at 7b061ff6a31120871deefb634c85449a422ed159
  storage/tokudb/mysql-test/tokudb/t/bf_insert_select_dup_key.test mysql-test/suite/tokudb/t/bf__insert__select__dup__key.test at 7b061ff6a31120871deefb634c85449a422ed159
  storage/tokudb/mysql-test/tokudb/t/bf_replace_select.test mysql-test/suite/tokudb/t/bf__replace__select.test at 7b061ff6a31120871deefb634c85449a422ed159
  storage/tokudb/mysql-test/tokudb/t/bf_select_hash_part.test mysql-test/suite/tokudb/t/bf__select__hash__part.test at 7b061ff6a31120871deefb634c85449a422ed159
  storage/tokudb/mysql-test/tokudb/t/bf_select_range_part.test mysql-test/suite/tokudb/t/bf__select__range__part.test at 7b061ff6a31120871deefb634c85449a422ed159
  storage/tokudb/mysql-test/tokudb_bugs/r/tokudb718.result mysql-test/suite/tokudb.bugs/r/tokudb718.result at 613b729ae9b0f7259733ea083c8ccd6fc2f8ef46
  storage/tokudb/mysql-test/tokudb_bugs/t/tokudb718.test mysql-test/suite/tokudb.bugs/t/tokudb718.test at 613b729ae9b0f7259733ea083c8ccd6fc2f8ef46

Diff too large for email (307224 lines, the limit is 20000).


More information about the commits mailing list