← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_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/sql_table.cc
1979
1979
{
1980
1980
  int protoerr= EEXIST;
1981
1981
  message::Table new_proto;
1982
 
  message::Table src_proto;
 
1982
  message::TablePtr src_proto;
1983
1983
 
1984
1984
  protoerr= plugin::StorageEngine::getTableDefinition(session,
1985
1985
                                                      src_table,
1986
1986
                                                      src_proto);
1987
 
  new_proto.CopyFrom(src_proto);
 
1987
  new_proto.CopyFrom(*src_proto);
1988
1988
 
1989
1989
  if (destination_identifier.isTmp())
1990
1990
  {