← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/show.cc

  • Committer: Monty Taylor
  • Date: 2009-03-05 02:10:27 UTC
  • mfrom: (908.3.8 for-brian)
  • mto: This revision was merged to the branch mainline in revision 912.
  • Revision ID: mordred@inaugust.com-20090305021027-1nw5yl1uzulytl42
Merging stewart.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/show.cc
303
303
    }
304
304
    else
305
305
    {
306
 
        // Return only .frm files which aren't temp files.
307
 
      if (my_strcasecmp(system_charset_info, ext=fn_rext(file->name),reg_ext) ||
 
306
      // Return only .frm files which aren't temp files.
 
307
      if (my_strcasecmp(system_charset_info, ext=fn_rext(file->name),".dfe") ||
308
308
          is_prefix(file->name, TMP_FILE_PREFIX))
309
309
        continue;
310
310
      *ext=0;
2259
2259
  {
2260
2260
    char path[FN_REFLEN];
2261
2261
    (void) build_table_filename(path, sizeof(path), db_name->str,
2262
 
                                table_name->str, reg_ext, 0);
 
2262
                                table_name->str, "", 0);
2263
2263
 
2264
2264
      table->field[3]->store(STRING_WITH_LEN("BASE Table"),
2265
2265
                             system_charset_info);