← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/table_proto_write.cc

  • Committer: Brian Aker
  • Date: 2010-08-06 01:25:55 UTC
  • mfrom: (1688.1.3 drizzle)
  • Revision ID: brian@gaz-20100806012555-f1bxjm4iesdtiwlw
Merge Build (rollup)

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/table_proto_write.cc
44
44
namespace drizzled {
45
45
 
46
46
static int fill_table_proto(message::Table &table_proto,
47
 
                            const std::string &table_name,
48
47
                            List<CreateField> &create_fields,
49
48
                            HA_CREATE_INFO *create_info,
50
49
                            uint32_t keys,
63
62
  assert(strcmp(table_proto.engine().name().c_str(),
64
63
                create_info->db_type->getName().c_str())==0);
65
64
 
66
 
  assert(table_proto.name() == table_name);
67
 
 
68
65
  int field_number= 0;
69
66
  bool use_existing_fields= table_proto.field_size() > 0;
70
67
  while ((field_arg= it++))
536
533
                      List<CreateField> &create_fields,
537
534
                      uint32_t keys, KeyInfo *key_info)
538
535
{
539
 
  if (fill_table_proto(table_proto, identifier.getTableName(), create_fields, create_info,
 
536
  assert(table_proto.has_name());
 
537
  if (fill_table_proto(table_proto, create_fields, create_info,
540
538
                       keys, key_info))
541
539
    return false;
542
540
 
 
541
  assert(table_proto.name() == identifier.getTableName());
 
542
 
543
543
  if (plugin::StorageEngine::createTable(*session,
544
544
                                         identifier,
545
545
                                         table_proto))