← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/show.cc

  • Committer: Stewart Smith
  • Date: 2008-11-21 16:06:07 UTC
  • mto: This revision was merged to the branch mainline in revision 593.
  • Revision ID: stewart@flamingspork.com-20081121160607-n6gdlt013spuo54r
remove mysql_frm_type
and fix engines to return correct value from delete_table when table doesn't exist.
(it should be ENOENT).

Also fix up some tests that manipulated frm files by hand. These tests are no longer valid and will need to be rewritten in the not too distant future.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/show.cc
2345
2345
  }
2346
2346
  else
2347
2347
  {
2348
 
    enum legacy_db_type not_used;
2349
2348
    char path[FN_REFLEN];
2350
2349
    (void) build_table_filename(path, sizeof(path), db_name->str, 
2351
2350
                                table_name->str, reg_ext, 0);
2352
 
    if (mysql_frm_type(session, path, &not_used)) 
2353
 
    {
 
2351
 
2354
2352
      table->field[3]->store(STRING_WITH_LEN("BASE Table"),
2355
2353
                             system_charset_info);
2356
 
    }
2357
 
    else
2358
 
    {
2359
 
      table->field[3]->store(STRING_WITH_LEN("ERROR"),
2360
 
                             system_charset_info);
2361
 
    }
2362
2354
 
2363
2355
    if (session->is_error() && session->main_da.sql_errno() == ER_NO_SUCH_TABLE)
2364
2356
    {