From: Roy Lyseng
Date: July 30 2010 7:33am
Subject: bzr commit into mysql-next-mr-opt-backporting branch (roy.lyseng:3221)
List-Archive: http://lists.mysql.com/commits/114706
Message-Id: <20100730073342.8ECD31E6@tyr67.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============7168884160407771615=="

--===============7168884160407771615==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#At file:///home/rl136806/mysql/repo/mysql-review/ based on revid:epotemkin@stripped

 3221 Roy Lyseng	2010-07-30
      Delete redundant and erroneous call to print_plan().
      This function is only called in debug mode, so implication is minor.

    modified:
      sql/sql_select.cc
=== modified file 'sql/sql_select.cc'
--- a/sql/sql_select.cc	2010-07-29 09:56:47 +0000
+++ b/sql/sql_select.cc	2010-07-30 07:32:20 +0000
@@ -7878,9 +7878,6 @@ best_extension_by_limited_search(JOIN   
   if (thd->killed)  // Abort
     DBUG_RETURN(TRUE);
 
-  DBUG_EXECUTE("opt", print_plan(join, idx, read_time, record_count, idx,
-                                 "SOFAR:"););
-
   /* 
      'join' is a partial plan with lower cost than the best plan so far,
      so continue expanding it further with the tables in 'remaining_tables'.


--===============7168884160407771615==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/roy.lyseng@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: roy.lyseng@stripped
# target_branch: file:///home/rl136806/mysql/repo/mysql-review/
# testament_sha1: acbb427d54f972d8564c59918377546600c1a7d5
# timestamp: 2010-07-30 09:33:42 +0200
# base_revision_id: epotemkin@stripped\
#   h345e5zm0x4ztf60
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWaklE4MAAXffgAAQUGf/91YE
FAC/7//wUAOW3ndiXejcV7OElEmmaaptGk9NT2oyYIJoDTQaCUSiemT2qR+p5CamEybQNGoDTJhK
EaCU/VT8pjRPUzRIxpPRNoNQMRqQnqYmT1GIYDRMIwTRpgElNQaCZplHqaJintJB5QB6nqNo1Zft
NsCBU0oPSKg6sdU51FEGnUVb7j8wzKqKRXz/z9Gp5+nOL9jkiFL26NKrGanvft06dDZeIyiYb8+F
8jqI0TC3GQTQ654Q6mEHkqkCdKVKh7YtNEaYxW7xN84lIjeKpIwKFnYw9nVSueAbAtN71av4eqe6
i4W4IAzncawXVxMhyc2sWyv1fPZVP7F05D9a74xzcNOMjyLHgr2bXW49KfOwRmEM7CYDEI7LO7CG
Q66xQiYNhCuLIlTdaAmuP3C0SRTUXW6iyNJWxUlFmqZemNwXBiVUO3EqavB41C9gjZe5uAWxjdhu
DNybIfmHY1BGYVnKGcA1RrjFXjpizuIBaaCo5OJBWdp0AqSFvPkfBQMekilSki+dWQ7ftKo7qKCi
or1mWgMq6CocMsRMZTKkZo7DNHJQjfer3sTeCLKrSHCdF9DTx13cdSQ2eubh+kR7lRT42Qs0ZWqQ
7TjmqDEoCRw5isl5f16pNwK8KQs0IYwqldpqRUnXSk+/IjGtIDoryq827IG0HtGDJcNzqSvM7FY8
GYuPUxgDgEiwmAcjEmlxLAf5LjmcIJ5bgHQsrU6zIUJLHq3X3NAtsVhOExxMcH5h7ZpghborjVTM
c9dC7+nQiFtdPky35aXLtSDQNJ3TFNwCmEkmF99hW9EUizVnPIouzgw9dWw4mB4GntdrkqaOiExs
XRiU5zQ/lvvDoN6A8V/t8SBtVXYXHk7LDynP6dBxJUE1IDDS/p26noYhyuLBcpHRsI7hQ0hmP8id
gUCDBBJ4kqoijpJX3GC5vlzRNohxCgjZJTZYx1bcApwelClW/oQJjqjAsodaxBojVA3wh63cykx1
RVTcMsW45FjCzBVi10wcTik8LlsZODLDzYlhir8VVIE9u8zjyEtYMo3XaLIE9f2qiohypFDtrviT
vrQj76ZTTfpcK1rx4S0JpGpmZPsDGSXBOC4ktiShk625DMXl6J2GKZjwQraIY4Hy0DhdXngUYWcx
YBiD3Ka2z4PGfq9bEa8hwWju53Bk/XiMk76nmlLBFOs5A73CcrP8XckU4UJCpJRODA==


--===============7168884160407771615==--