← Back to branch summary

~james-page/ubuntu/precise/mysql-5.5/misc-fixes

« back to all changes in this revision

Viewing changes to sql/sql_select.cc

  • Committer: Package Import Robot
  • Author(s): Marc Deslauriers
  • Date: 2012-06-11 07:34:33 UTC
  • mfrom: (1.1.6)
  • Revision ID: package-import@ubuntu.com-20120611073433-l9za2ni4ipp848y3
Tags: 5.5.24-0ubuntu0.12.04.1
https://launchpad.net/bugs/1011371
* SECURITY UPDATE: Update to 5.5.24 to fix security issues (LP: #1011371)
  - http://dev.mysql.com/doc/refman/5.5/en/news-5-5-24.html

Show diffs side-by-side

added added

removed removed

Lines of Context:
sql/sql_select.cc
5890
5890
      }
5891
5891
      keyuse++;
5892
5892
    } while (keyuse->table == table && keyuse->key == key);
 
5893
    DBUG_ASSERT(length > 0 && keyparts != 0);
5893
5894
  } /* not ftkey */
5894
5895
 
5895
5896
  /* set up fieldref */
13698
13699
  DBUG_ENTER("test_if_skip_sort_order");
13699
13700
  LINT_INIT(ref_key_parts);
13700
13701
 
 
13702
  /* Check that we are always called with first non-const table */
 
13703
  DBUG_ASSERT(tab == tab->join->join_tab + tab->join->const_tables);
 
13704
 
13701
13705
  /*
13702
13706
    Keys disabled by ALTER TABLE ... DISABLE KEYS should have already
13703
13707
    been taken into account.
13779
13783
          while (keyuse->key != new_ref_key && keyuse->table == tab->table)
13780
13784
            keyuse++;
13781
13785
          if (create_ref_for_key(tab->join, tab, keyuse, 
13782
 
                                 tab->join->const_table_map))
 
13786
                                 (tab->join->const_table_map |
 
13787
                                  OUTER_REF_TABLE_BIT)))
13783
13788
            DBUG_RETURN(0);
13784
13789
 
13785
13790
          pick_table_access_method(tab);