← 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-03-03 18:25:57 UTC
  • mto: This revision was merged to the branch mainline in revision 1321.
  • Revision ID: brian@gaz-20100303182557-im5161b11zxf0bbx
More reference cleanup.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_table.cc
529
529
  return 0;
530
530
}
531
531
 
532
 
int mysql_prepare_create_table(Session *session,
533
 
                               HA_CREATE_INFO *create_info,
534
 
                               message::Table *create_proto,
535
 
                               AlterInfo *alter_info,
536
 
                               bool tmp_table,
537
 
                               uint32_t *db_options,
538
 
                               Cursor *cursor,
539
 
                               KEY **key_info_buffer,
540
 
                               uint32_t *key_count,
541
 
                               int select_field_count)
 
532
static int mysql_prepare_create_table(Session *session,
 
533
                                      HA_CREATE_INFO *create_info,
 
534
                                      message::Table &create_proto,
 
535
                                      AlterInfo *alter_info,
 
536
                                      bool tmp_table,
 
537
                                      uint32_t *db_options,
 
538
                                      Cursor *cursor,
 
539
                                      KEY **key_info_buffer,
 
540
                                      uint32_t *key_count,
 
541
                                      int select_field_count)
542
542
{
543
543
  const char    *key_name;
544
544
  CreateField   *sql_field,*dup_field;
950
950
    */
951
951
    key_info->block_size= (key->key_create_info.block_size ?
952
952
                           key->key_create_info.block_size :
953
 
                           create_proto->options().key_block_size());
 
953
                           create_proto.options().key_block_size());
954
954
 
955
955
    if (key_info->block_size)
956
956
      key_info->flags|= HA_USES_BLOCK_SIZE;
1010
1010
      }
1011
1011
      cols2.rewind();
1012
1012
 
1013
 
      if (create_proto->field_size() > 0)
1014
 
        protofield= create_proto->mutable_field(proto_field_nr - 1);
 
1013
      if (create_proto.field_size() > 0)
 
1014
        protofield= create_proto.mutable_field(proto_field_nr - 1);
1015
1015
 
1016
1016
      {
1017
1017
        column->length*= sql_field->charset->mbmaxlen;
1344
1344
  set_table_default_charset(create_info, identifier.getDBName());
1345
1345
 
1346
1346
  /* Check if table exists */
1347
 
  if (mysql_prepare_create_table(session, create_info, &table_proto, alter_info,
 
1347
  if (mysql_prepare_create_table(session, create_info, table_proto, alter_info,
1348
1348
                                 internal_tmp_table,
1349
1349
                                 &db_options, cursor,
1350
1350
                                 &key_info_buffer, &key_count,