bzr commit into mysql-next-mr-bugfixing branch (tor.didriksen:3193) Bug#50358

[Tor Didriksen]

#At file:///export/home/didrik/repo/next-mr-opt-backporting-br1/ based on revid:guilhem@stripped

 3193 Tor Didriksen	2010-06-14
      Post push fix for BUG#50358, dont inline JOIN_TAB::get_sj_strategy

    modified:
      sql/sql_select.cc
=== modified file 'sql/sql_select.cc'
--- a/sql/sql_select.cc	2010-06-11 12:27:38 +0000
+++ b/sql/sql_select.cc	2010-06-14 06:53:02 +0000
@@ -10834,7 +10834,7 @@ void JOIN_TAB::cleanup()
 /**
   @returns semijoin strategy for this table.
 */
-inline uint JOIN_TAB::get_sj_strategy() const
+uint JOIN_TAB::get_sj_strategy() const
 {
   if (first_sj_inner_tab == NULL)
     return SJ_OPT_NONE;


Attachment: [text/bzr-bundle] bzr/[e-mail]