← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/plugin/storage_engine.cc

  • Committer: Monty Taylor
  • Date: 2009-04-08 03:20:31 UTC
  • mto: (992.1.1 mordred)
  • mto: This revision was merged to the branch mainline in revision 979.
  • Revision ID: mordred@inaugust.com-20090408032031-hwb47ug03xfwfuge
Remove most of plugin_ref. Fix several leaks (where the malloc was happening but never freed). One step away from no more plugin_ref. Yippee. It's so much easier the second time you try to do this.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/plugin/storage_engine.cc
75
75
  return HA_ERR_NO_SUCH_TABLE;
76
76
}
77
77
 
78
 
static plugin_ref ha_default_plugin(Session *session)
 
78
static st_plugin_int *ha_default_plugin(Session *session)
79
79
{
80
80
  if (session->variables.table_plugin)
81
81
    return session->variables.table_plugin;
94
94
*/
95
95
StorageEngine *ha_default_storage_engine(Session *session)
96
96
{
97
 
  plugin_ref plugin= ha_default_plugin(session);
 
97
  st_plugin_int *plugin= ha_default_plugin(session);
98
98
  assert(plugin);
99
 
  StorageEngine *engine= plugin_data(plugin, StorageEngine*);
 
99
  StorageEngine *engine= static_cast<StorageEngine *>(plugin->data);
100
100
  assert(engine);
101
101
  return engine;
102
102
}
111
111
  @return
112
112
    pointer to storage engine plugin handle
113
113
*/
114
 
plugin_ref ha_resolve_by_name(Session *session, const LEX_STRING *name)
 
114
st_plugin_int *ha_resolve_by_name(Session *session, const LEX_STRING *name)
115
115
{
116
116
  const LEX_STRING *table_alias;
117
 
  plugin_ref plugin;
 
117
  st_plugin_int *plugin;
118
118
 
119
119
redo:
120
120
  /* my_strnncoll is a macro and gcc doesn't do early expansion of macro */
125
125
 
126
126
  if ((plugin= plugin_lock_by_name(name, DRIZZLE_STORAGE_ENGINE_PLUGIN)))
127
127
  {
128
 
    StorageEngine *engine= plugin_data(plugin, StorageEngine *);
 
128
    StorageEngine *engine= static_cast<StorageEngine *>(plugin->data);
129
129
    if (engine->is_user_selectable())
130
130
      return plugin;
131
131
  }
149
149
}
150
150
 
151
151
 
152
 
plugin_ref ha_lock_engine(Session *, StorageEngine *engine)
 
152
st_plugin_int *ha_lock_engine(Session *, StorageEngine *engine)
153
153
{
154
154
  if (engine)
155
155
  {
156
 
    st_plugin_int **plugin= &(engine2plugin[engine->slot]);
 
156
    st_plugin_int *plugin= engine2plugin[engine->slot];
157
157
 
158
158
    return plugin;
159
159
  }