← 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: 2009-04-07 20:09:30 UTC
  • mfrom: (971.1.17 mordred)
  • Revision ID: brian@gaz-20090407200930-27jkul7lkwkjs2to
Merge from Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_table.cc
5424
5424
  StorageEngine *req_engine= *new_engine;
5425
5425
  if (!req_engine->is_enabled())
5426
5426
  {
5427
 
    const char *engine_name= ha_resolve_storage_engine_name(req_engine);
5428
 
    my_error(ER_FEATURE_DISABLED,MYF(0),engine_name,engine_name);
 
5427
    string engine_name= req_engine->getName();
 
5428
    my_error(ER_FEATURE_DISABLED,MYF(0),
 
5429
             engine_name.c_str(), engine_name.c_str());
 
5430
             
5429
5431
    return true;
5430
5432
  }
5431
5433
 
5434
5436
    push_warning_printf(session, DRIZZLE_ERROR::WARN_LEVEL_NOTE,
5435
5437
                       ER_WARN_USING_OTHER_HANDLER,
5436
5438
                       ER(ER_WARN_USING_OTHER_HANDLER),
5437
 
                       ha_resolve_storage_engine_name(*new_engine),
 
5439
                       ha_resolve_storage_engine_name(*new_engine).c_str(),
5438
5440
                       table_name);
5439
5441
  }
5440
5442
  if (create_info->options & HA_LEX_CREATE_TMP_TABLE &&
5443
5445
    if (create_info->used_fields & HA_CREATE_USED_ENGINE)
5444
5446
    {
5445
5447
      my_error(ER_ILLEGAL_HA_CREATE_OPTION, MYF(0),
5446
 
               ha_resolve_storage_engine_name(*new_engine), "TEMPORARY");
 
5448
               ha_resolve_storage_engine_name(*new_engine).c_str(),
 
5449
               "TEMPORARY");
5447
5450
      *new_engine= 0;
5448
5451
      return true;
5449
5452
    }