← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/myisam/ha_myisam.cc

Merge trunk:

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/myisam/ha_myisam.cc
93
93
 
94
94
  int doCreateTable(Session *, const char *table_name,
95
95
                    Table& table_arg,
96
 
                    HA_CREATE_INFO& ha_create_info,
97
96
                    drizzled::message::Table&);
98
97
 
99
98
  int doRenameTable(Session*, const char *from, const char *to);
1365
1364
 
1366
1365
int MyisamEngine::doCreateTable(Session *, const char *table_name,
1367
1366
                                Table& table_arg,
1368
 
                                HA_CREATE_INFO& ha_create_info,
1369
1367
                                drizzled::message::Table& create_proto)
1370
1368
{
1371
1369
  int error;
1382
1380
  create_info.max_rows= create_proto.options().max_rows();
1383
1381
  create_info.reloc_rows= create_proto.options().min_rows();
1384
1382
  create_info.with_auto_increment= share->next_number_key_offset == 0;
1385
 
  create_info.auto_increment= (ha_create_info.auto_increment_value ?
1386
 
                               ha_create_info.auto_increment_value -1 :
 
1383
  create_info.auto_increment= (create_proto.options().has_auto_increment_value() ?
 
1384
                               create_proto.options().auto_increment_value() -1 :
1387
1385
                               (uint64_t) 0);
1388
1386
  create_info.data_file_length= (create_proto.options().max_rows() *
1389
1387
                                 create_proto.options().avg_row_length());
1391
1389
  create_info.index_file_name=  NULL;
1392
1390
  create_info.language= share->table_charset->number;
1393
1391
 
1394
 
  if (ha_create_info.options & HA_LEX_CREATE_TMP_TABLE)
 
1392
  if (create_proto.type() == drizzled::message::Table::TEMPORARY)
1395
1393
    create_flags|= HA_CREATE_TMP_TABLE;
1396
 
  if (ha_create_info.options & HA_CREATE_KEEP_FILES)
1397
 
    create_flags|= HA_CREATE_KEEP_FILES;
1398
1394
  if (options & HA_OPTION_PACK_RECORD)
1399
1395
    create_flags|= HA_PACK_RECORD;
1400
1396