← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/plugin/storage_engine.cc

  • Committer: Brian Aker
  • Date: 2009-08-17 15:34:55 UTC
  • mto: (1117.1.9 merge)
  • mto: This revision was merged to the branch mainline in revision 1118.
  • Revision ID: brian@gaz-20090817153455-emrlqx6cbxo9knfm
Fix for Stewart's patch (includes hack to solve MAX rows problem).

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/plugin/storage_engine.cc
732
732
  int error= 1;
733
733
  Table table;
734
734
  TableShare share(db, 0, table_name, path);
 
735
  drizzled::message::Table tmp_proto;
735
736
 
736
737
  if (table_proto)
737
738
  {
740
741
  }
741
742
  else
742
743
  {
 
744
    table_proto= &tmp_proto;
743
745
    if (open_table_def(session, &share))
744
746
      goto err;
745
747
  }
749
751
    goto err;
750
752
 
751
753
  if (update_create_info)
752
 
    table.updateCreateInfo(create_info);
 
754
    table.updateCreateInfo(create_info, table_proto);
753
755
 
754
756
  error= share.storage_engine->createTable(session, path, &table,
755
757
                                           create_info, table_proto);