From: Jorgen Loland Date: April 7 2011 1:29pm Subject: bzr commit into mysql-trunk branch (jorgen.loland:3289) List-Archive: http://lists.mysql.com/commits/134936 Message-Id: <20110407132908.746693A7@atum21.norway.sun.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============4848394573249678836==" --===============4848394573249678836== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline #At file:///export/home/jl208045/mysql/wl4800/mysql-next-mr-opt-backporting-wl4800/ based on revid:jorgen.loland@stripped 3289 Jorgen Loland 2011-04-07 Very small fix: make SEL_ARG *keypart_range const in trace_range_all_keyparts() @ sql/opt_range.cc Make SEL_ARG *keypart_range const in trace_range_all_keyparts() modified: sql/opt_range.cc === modified file 'sql/opt_range.cc' --- a/sql/opt_range.cc 2011-04-06 09:19:23 +0000 +++ b/sql/opt_range.cc 2011-04-07 13:29:04 +0000 @@ -12429,7 +12429,7 @@ static void trace_range_all_keyparts(Opt // Navigate to first interval in red-black tree const KEY_PART_INFO *cur_key_part= key_parts + keypart_root->part; - SEL_ARG *keypart_range= keypart_root->first(); + const SEL_ARG *keypart_range= keypart_root->first(); while (keypart_range) { --===============4848394573249678836== MIME-Version: 1.0 Content-Type: text/bzr-bundle; charset="us-ascii"; name="bzr/jorgen.loland@stripped" Content-Transfer-Encoding: 7bit Content-Disposition: inline # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: jorgen.loland@stripped\ # wbcjap4ihlz82rue # target_branch: file:///export/home/jl208045/mysql/wl4800/mysql-next-\ # mr-opt-backporting-wl4800/ # testament_sha1: bb105207ba1a9f081e4063742464e8ecf88e316a # timestamp: 2011-04-07 15:29:08 +0200 # source_branch: file:///export/home/jl208045/mysql/wl4800/mysql-next-\ # mr-opt-backporting-wl4800/ # base_revision_id: jorgen.loland@stripped\ # 3v4t3fnkc7xwqal6 # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWSXq5IwAAZVfgEAQUHP//3KW GQC////wUAPYGE86zWK9vXDJUPUyB6ah5IGj1DQAaAAGglFMk8SZN6gUZNpNMg0AAA0AkUBJkwg0 0Jqn6UeTIm9SGjaZIaMMqI2U2p6E0aBkxG1AAAaAYJJJoJkTxE9NT0T1NMmNRgIAMh+uPLR/SR7Z 79y3Y53ga5uFYQ4Y+kafotvbW2ynzX2lVncXxcf3ruK3wXp6f9Or93jl/bVGXY8tu3LHTWQYqXvZ 496grV7CN/QLPJPJ63P13/VZ6dReucLQC5IydY3OcxdH3qO/LlcqqAh7WpCYiToI4z/IGpyVjoo2 OFqo13SXRqYiuBt6TEQjYo6r8rckvqv2Ptb7HPd28849OIuy0k78Bl/BrTeVpYIjnaHC5UhskaFR atCuQSeJBge1KZqVHPEhxo+Y5tejGuwhKQQuQ0o2S5WEWytwhQXLi6dMVeSaOGM5uzG1I/WkTeHK lsqlgb6Qz2tOmJGWVOAHKQBrlovct5U/iQUi2icKqH6mCoTGJrt5NlpHYlA25pkywLtaXagklt99 47Bf4S1V5ywHjnMsnygtmwWsImoU+U8olFKasuk7yw2f/DbRSZZwK3bHVonIgqQUoScDCeoK2P8/ kceHuev4bYGNPnsuekdFFMzMN8O5rmtb1O76Tk78UanpdaMDgGNTuLDBpMsNhoc41dxrN9zkiKxY CAMnPiG6DtGzFsLgCgI/AuYSKgRNsot69iDgdWl9ycGaqFhUZuDMEpu9A4T8kSmSTLNnFC5gUSRg uUWiijRWYiYqutFsjTfRRSMI9Dcp/zhvMz+jCI4IYKGmSZLhjA8u+2vg4TLRhzPOfwjTl84RmY8c nsocWSfh7QwBeZmKHi5r5J5LxUYQIqBYDSjAXZwDDFiUHm6IIAsM+y5X48nz8AzIkyHBNLAaYQBY U66PkFmIr1NbdXqmv3bQaKspFOiApWUL8b/mqiGkL2YLXQa6hRh7m0Z0rzEFhL0WGoUU3FWBvnB8 oPXSA3gp7SVIZRlTGzgkSbxXkijBmUl8mMXZJniCIjtdIYWjckNXVJA0iNIqIiGoO2qisRVpqZdP 6YpG4FQNzlCprWVv6kZw/vVI6l5D1SUBWHWKrGzLxEzgRPpVK4hALMwCylaZD4MAdJO7OCEkLZdD xSAVVgsP8ukYddYWWQHUTizsWDewlh3MutB0VcOnRwjnmoGTVM5BswV2Q34J2hB9BkQUyEVswSw2 y71qlgO0Nas4wkmtO7muMxddXl5hetFcmHJLMPJUWEw5BYsARp4u+sWOQfIv8XckU4UJAl6uSMA= --===============4848394573249678836==--