← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/show.cc

  • Committer: Brian Aker
  • Date: 2009-03-27 00:14:08 UTC
  • mto: This revision was merged to the branch mainline in revision 967.
  • Revision ID: brian@tangent.org-20090327001408-n6uxtfiymazy1pgf
Refactor plugin loading to remove mask (one step closer to getting rid of
malloc!)

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/show.cc
137
137
  else
138
138
    table->field[1]->set_null();
139
139
 
140
 
  switch (plugin_state(plugin)) {
141
 
  /* case PLUGIN_IS_FREED: does not happen */
142
 
  case PLUGIN_IS_DELETED:
143
 
    table->field[2]->store(STRING_WITH_LEN("DELETED"), cs);
144
 
    break;
145
 
  case PLUGIN_IS_UNINITIALIZED:
 
140
  if (plugin[0]->isInited)
 
141
    table->field[2]->store(STRING_WITH_LEN("ACTIVE"), cs);
 
142
  else
146
143
    table->field[2]->store(STRING_WITH_LEN("INACTIVE"), cs);
147
 
    break;
148
 
  case PLUGIN_IS_READY:
149
 
    table->field[2]->store(STRING_WITH_LEN("ACTIVE"), cs);
150
 
    break;
151
 
  default:
152
 
    assert(0);
153
 
  }
154
144
 
155
145
  table->field[3]->store(plugin_type_names[plug->type].str,
156
146
                         plugin_type_names[plug->type].length,
210
200
{
211
201
  Table *table= tables->table;
212
202
 
213
 
  if (plugin_foreach(session, show_plugins, DRIZZLE_ANY_PLUGIN,
214
 
                     table, ~PLUGIN_IS_FREED))
 
203
  if (plugin_foreach(session, show_plugins, DRIZZLE_ANY_PLUGIN, table, ~2))
215
204
    return(1);
216
205
 
217
206
  return(0);
4526
4515
    schema_table->table_name= plugin->name.str;
4527
4516
  }
4528
4517
 
4529
 
  plugin->state= PLUGIN_IS_READY;
4530
 
 
4531
4518
  return 0;
4532
4519
err:
4533
4520
  delete schema_table;