← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/info_schema/tables.cc

  • Committer: Brian Aker
  • Date: 2010-01-15 01:41:40 UTC
  • mfrom: (1259.8.3 i_s_work)
  • Revision ID: brian@gaz-20100115014140-0n6kh7fqhp1abqs4
Merge Joe Daly

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/info_schema/tables.cc
215
215
                                            0,
216
216
                                            "Comment"));
217
217
 
 
218
  columns->push_back(new plugin::ColumnInfo("PLUGIN_NAME",
 
219
                                            64,
 
220
                                            DRIZZLE_TYPE_VARCHAR,
 
221
                                            0,
 
222
                                            MY_I_S_MAYBE_NULL,
 
223
                                            "Plugin_name"));
 
224
 
218
225
  return columns;
219
226
}
220
227
 
287
294
  table->setWriteSet(18);
288
295
  table->setWriteSet(19);
289
296
  table->setWriteSet(20);
 
297
  table->setWriteSet(21);
290
298
  table->field[1]->store(db_name->str, db_name->length, cs);
291
299
  table->field[2]->store(table_name->str, table_name->length, cs);
 
300
 
292
301
  if (res)
293
302
  {
294
303
    /*
365
374
      table->field[20]->store(share->getComment(),
366
375
                              share->getCommentLength(), cs);
367
376
 
 
377
    drizzled::plugin::InfoSchemaTable *tmp_table= 
 
378
      drizzled::plugin::InfoSchemaTable::getTable(table_name->str);
 
379
 
 
380
    if (tmp_table != NULL)
 
381
    {
 
382
      const std::string &plugin_name= tmp_table->getPluginName();
 
383
 
 
384
      if (! plugin_name.empty())
 
385
      {
 
386
        table->field[21]->set_notnull();
 
387
        table->field[21]->store(plugin_name.c_str(), plugin_name.size(), cs);
 
388
      }
 
389
    }
 
390
 
368
391
    if (cursor)
369
392
    {
370
393
      cursor->info(HA_STATUS_VARIABLE |