← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/info_schema/tables.cc

  • Committer: Padraig O'Sullivan
  • Date: 2009-11-26 04:33:51 UTC
  • mto: (1228.4.1 push)
  • mto: This revision was merged to the branch mainline in revision 1234.
  • Revision ID: osullivan.padraig@gmail.com-20091126043351-2ebmuyzrbifxat0q
Removed all remnants of schema_table from the TableList class. This cleans up a bunch of code.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/info_schema/tables.cc
294
294
      there was errors during opening tables
295
295
    */
296
296
    const char *error= session->is_error() ? session->main_da.message() : "";
297
 
    if (tables->schema_table)
298
 
    {
299
 
      table->field[3]->store(STRING_WITH_LEN("SYSTEM VIEW"), cs);
300
 
    }
301
 
    else
302
 
    {
303
 
      table->field[3]->store(STRING_WITH_LEN("BASE Table"), cs);
304
 
    }
 
297
    table->field[3]->store(STRING_WITH_LEN("BASE Table"), cs);
305
298
    table->field[20]->store(error, strlen(error), cs);
306
299
    session->clear_error();
307
300
  }
407
400
        break;
408
401
      }
409
402
      table->field[6]->store(tmp_buff, strlen(tmp_buff), cs);
410
 
      if (! tables->schema_table)
411
 
      {
412
 
        table->field[7]->store((int64_t) cursor->stats.records, true);
413
 
        table->field[7]->set_notnull();
414
 
      }
 
403
      table->field[7]->store((int64_t) cursor->stats.records, true);
 
404
      table->field[7]->set_notnull();
415
405
      table->field[8]->store((int64_t) cursor->stats.mean_rec_length, true);
416
406
      table->field[9]->store((int64_t) cursor->stats.data_file_length, true);
417
407
      if (cursor->stats.max_data_file_length)