List:Commits« Previous MessageNext Message »
From:Sergey Petrunia Date:January 13 2006 10:26pm
Subject:bk commit into 5.0 tree (sergefp:1.2022) BUG#16393
View as plain text  
Below is the list of changes that have just been committed into a local
5.0 repository of psergey. When psergey does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository

  1.2022 06/01/14 01:26:42 sergefp@stripped +1 -0
  BUG#16393: post-review fixes: fix comments.

    1.380 06/01/14 01:26:34 sergefp@stripped +5 -13
    BUG#16393: post-review fixes: fix comments.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	sergefp
# Host:	newbox.mylan
# Root:	/home/psergey/mysql-5.0-bug16393-r2

--- 1.379/sql/	2006-01-13 23:55:23 +03:00
+++ 1.380/sql/	2006-01-14 01:26:34 +03:00
@@ -2925,34 +2925,26 @@
       nested_join_table  IN     Nested join pseudo-table to process
       end                INOUT  End of the key field array
       and_level          INOUT  And-level
     This function populates KEY_FIELD array with entries generated from the 
     ON condition of the given nested join, and does the same for nested joins 
     contained within this nested join.
     We can add accesses to the tables that are direct children of this nested 
     join (1), and are not inner tables w.r.t their neighbours (2).
     Example for #1 (outer brackets pair denotes nested join this function is 
     invoked for):
      ... LEFT JOIN (t1 LEFT JOIN (t2 ... ) ) ON cond
     Example for #2:
      ... LEFT JOIN (t1 LEFT JOIN t2 ) ON cond
     In examples 1-2 for condition cond, we can add 'ref' access candidates to 
     t1 only.
     Example #3:
-     ... LEFT JOIN (t1, t2 JOIN t3 ON inner_cond) ON cond
+     ... LEFT JOIN (t1, t2 LEFT JOIN t3 ON inner_cond) ON cond
     Here we can add 'ref' access candidates for t1 and t2, but not for t3.
 static void add_key_fields_for_nj(TABLE_LIST *nested_join_table,
@@ -2969,7 +2961,7 @@
       add_key_fields_for_nj(table, end, and_level);
       if (!table->on_expr)
-	tables |= table->table->map;
+        tables |= table->table->map;
   add_key_fields(end, and_level, nested_join_table->on_expr, tables);
bk commit into 5.0 tree (sergefp:1.2022) BUG#16393Sergey Petrunia13 Jan