bzr commit into mysql-5.1-telco-7.0 branch (magnus.blaudd:4174)

[Magnus Blåudd]

#At file:///home/msvensson/mysql/7.0/ based on revid:magnus.blaudd@stripped

 4174 Magnus Blåudd	2011-02-07
      ndb
      - mark up removed lines for bug58940 with MCP tags

    modified:
      sql/sql_select.cc
=== modified file 'sql/sql_select.cc'
--- a/sql/sql_select.cc	2011-02-07 09:14:43 +0000
+++ b/sql/sql_select.cc	2011-02-07 10:17:30 +0000
@@ -11602,6 +11602,11 @@ evaluate_join_record(JOIN *join, JOIN_TA
       first_unmatched->found= 1;
       for (JOIN_TAB *tab= first_unmatched; tab <= join_tab; tab++)
       {
+#ifndef MCP_BUG58490
+#else
+        if (tab->table->reginfo.not_exists_optimize)
+          return NESTED_LOOP_NO_MORE_ROWS;
+#endif
         /* Check all predicates that has just been activated. */
         /*
           Actually all predicates non-guarded by first_unmatched->found

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