bzr push into mysql-6.0-opt branch (sergefp:2677 to 2678)

[Sergey Petrunia]

 2678 Sergey Petrunia	2008-07-14
      Fix typo bug setup_semijoin_dups_elimination: use join->best_positions, not join->positions.
modified:
  sql/sql_select.cc

 2677 Sergey Petrunia	2008-07-11
      Fix compiler's "variable maybe used uninitialized" warnings
modified:
  sql/sql_select.cc

=== modified file 'sql/sql_select.cc'
--- a/sql/sql_select.cc	2008-07-11 14:59:36 +0000
+++ b/sql/sql_select.cc	2008-07-14 11:32:23 +0000
@@ -1231,8 +1231,8 @@ int setup_semijoin_dups_elimination(JOIN
       tab->insideout_match_tab= join->join_tab + dups_ranges[j].end_idx - 1;
       
       /* Calculate key length */
-      uint nparts= join->positions[dups_ranges[j].start_idx].insideout_parts;
-      uint keyno= join->positions[dups_ranges[j].start_idx].insideout_key;
+      uint nparts= join->best_positions[dups_ranges[j].start_idx].insideout_parts;
+      uint keyno= join->best_positions[dups_ranges[j].start_idx].insideout_key;
       uint keylen= 0;
       for (uint kp=0; kp < nparts; kp++)
         keylen += tab->table->key_info[keyno].key_part[kp].store_length;