bzr push into mysql-5.6 branch (magnus.blaudd:4382 to 4383)

[magnus.blaudd]

 4383 magnus.blaudd@stripped	2012-10-03 [merge]
      Merge 5.6-bug14704659 -> 5.6

    modified:
      sql/abstract_query_plan.cc
 4382 Mattias Jonsson	2012-10-03 [merge]
      merge

=== modified file 'sql/abstract_query_plan.cc'
--- a/sql/abstract_query_plan.cc	2012-08-06 08:18:13 +0000
+++ b/sql/abstract_query_plan.cc	2012-10-03 10:32:19 +0000
@@ -30,7 +30,7 @@ namespace AQP
   */
   Join_plan::Join_plan(const JOIN* join)
    : m_join_tabs(join->join_tab),
-     m_access_count(join->tables),
+     m_access_count(join->primary_tables),
      m_table_accesses(NULL)
   {
     /*
@@ -193,14 +193,16 @@ namespace AQP
         return 1.0;
 
       case AT_ORDERED_INDEX_SCAN:
-        DBUG_ASSERT(get_join_tab()->join->best_positions[m_tab_no].records_read>0.0);
-        return get_join_tab()->join->best_positions[m_tab_no].records_read;
+        DBUG_ASSERT(get_join_tab()->position);
+        DBUG_ASSERT(get_join_tab()->position->records_read>0.0);
+        return get_join_tab()->position->records_read;
 
       case AT_MULTI_PRIMARY_KEY:
       case AT_MULTI_UNIQUE_KEY:
       case AT_MULTI_MIXED:
-        DBUG_ASSERT(get_join_tab()->join->best_positions[m_tab_no].records_read>0.0);
-        return get_join_tab()->join->best_positions[m_tab_no].records_read;
+        DBUG_ASSERT(get_join_tab()->position);
+        DBUG_ASSERT(get_join_tab()->position->records_read>0.0);
+        return get_join_tab()->position->records_read;
 
       case AT_TABLE_SCAN:
         DBUG_ASSERT(get_join_tab()->table->file->stats.records>0.0);

No bundle (reason: useless for push emails).