← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/definition/table.cc

  • Committer: Brian Aker
  • Date: 2010-11-10 05:50:26 UTC
  • mfrom: (1910.2.15 merge)
  • mto: This revision was merged to the branch mainline in revision 1922.
  • Revision ID: brian@tangent.org-20101110055026-shjlsd5jeumje2vt
Merge in tree for shared_ptr work.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/definition/table.cc
1693
1693
  local_error= 1;
1694
1694
  error_given= 0;
1695
1695
 
1696
 
  message::Table table;
 
1696
  message::TablePtr table;
1697
1697
 
1698
1698
  local_error= plugin::StorageEngine::getTableDefinition(session, identifier, table);
1699
1699
 
1706
1706
    }
1707
1707
    else
1708
1708
    {
1709
 
      if (not table.IsInitialized())
 
1709
      if (not table->IsInitialized())
1710
1710
      {
1711
1711
        local_error= 4;
1712
1712
      }
1714
1714
    goto err_not_open;
1715
1715
  }
1716
1716
 
1717
 
  local_error= parse_table_proto(session, table);
 
1717
  local_error= parse_table_proto(session, *table);
1718
1718
 
1719
1719
  setTableCategory(TABLE_CATEGORY_USER);
1720
1720