← Back to branch summary

~ubuntu-branches/ubuntu/trusty/drizzle/trusty

« back to all changes in this revision

Viewing changes to drizzled/sql_base.cc

  • Committer: Bazaar Package Importer
  • Author(s): Monty Taylor
  • Date: 2010-12-21 16:39:40 UTC
  • mfrom: (1.2.4 upstream)
  • Revision ID: james.westby@ubuntu.com-20101221163940-c1pfo1jjvx7909xq
Tags: 2010.12.06-0ubuntu1
* New upstream release.
* Added libaio-dev build depend for InnoDB.
* Removed libpcre patch - applied upstream.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_base.cc
1633
1633
     * table/schema information via error messages
1634
1634
     */
1635
1635
    TableIdentifier the_table(tables->getSchemaName(), tables->getTableName());
1636
 
    if (not plugin::Authorization::isAuthorized(getSecurityContext(),
1637
 
                                                the_table))
 
1636
    if (not plugin::Authorization::isAuthorized(user(), the_table))
1638
1637
    {
1639
1638
      result= -1;                               // Fatal error
1640
1639
      break;
1919
1918
      current_bitmap= table->write_set;
1920
1919
    }
1921
1920
 
1922
 
    //if (current_bitmap->testAndSet(field->field_index))
1923
 
    if (current_bitmap->test(field->field_index))
 
1921
    //if (current_bitmap->testAndSet(field->position()))
 
1922
    if (current_bitmap->test(field->position()))
1924
1923
    {
1925
1924
      if (session->mark_used_columns == MARK_COLUMNS_WRITE)
1926
1925
        session->dup_field= field;
2230
2229
      {
2231
2230
        Table *table= field_to_set->getTable();
2232
2231
        if (session->mark_used_columns == MARK_COLUMNS_READ)
2233
 
          table->setReadSet(field_to_set->field_index);
 
2232
          table->setReadSet(field_to_set->position());
2234
2233
        else
2235
 
          table->setWriteSet(field_to_set->field_index);
 
2234
          table->setWriteSet(field_to_set->position());
2236
2235
      }
2237
2236
    }
2238
2237
  }
2904
2903
      {
2905
2904
        Table *table_1= nj_col_1->table_ref->table;
2906
2905
        /* Mark field_1 used for table cache. */
2907
 
        table_1->setReadSet(field_1->field_index);
 
2906
        table_1->setReadSet(field_1->position());
2908
2907
        table_1->covering_keys&= field_1->part_of_key;
2909
2908
        table_1->merge_keys|= field_1->part_of_key;
2910
2909
      }
2912
2911
      {
2913
2912
        Table *table_2= nj_col_2->table_ref->table;
2914
2913
        /* Mark field_2 used for table cache. */
2915
 
        table_2->setReadSet(field_2->field_index);
 
2914
        table_2->setReadSet(field_2->position());
2916
2915
        table_2->covering_keys&= field_2->part_of_key;
2917
2916
        table_2->merge_keys|= field_2->part_of_key;
2918
2917
      }
3658
3657
      if ((field= field_iterator.field()))
3659
3658
      {
3660
3659
        /* Mark fields as used to allow storage engine to optimze access */
3661
 
        field->getTable()->setReadSet(field->field_index);
 
3660
        field->getTable()->setReadSet(field->position());
3662
3661
        if (table)
3663
3662
        {
3664
3663
          table->covering_keys&= field->part_of_key;