← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/session.cc

  • Committer: Brian Aker
  • Date: 2010-03-05 03:12:24 UTC
  • mfrom: (1273.1.32 bug530870)
  • Revision ID: brian@gaz-20100305031224-ijnk5d5n4dut5mtv
Merge Jay's bugfix.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/session.cc
145
145
  return session->get_proc_info();
146
146
}
147
147
 
148
 
void **Session::getEngineData(const plugin::StorageEngine *engine)
 
148
void **Session::getEngineData(const plugin::MonitoredInTransaction *monitored)
149
149
{
150
 
  return static_cast<void **>(&ha_data[engine->slot].ha_ptr);
 
150
  return static_cast<void **>(&ha_data[monitored->getId()].ha_ptr);
151
151
}
152
152
 
153
 
ResourceContext *Session::getResourceContext(const plugin::StorageEngine *engine,
 
153
ResourceContext *Session::getResourceContext(const plugin::MonitoredInTransaction *monitored,
154
154
                                             size_t index)
155
155
{
156
 
  return &ha_data[engine->getSlot()].resource_context[index];
 
156
  return &ha_data[monitored->getId()].resource_context[index];
157
157
}
158
158
 
159
159
extern "C"
185
185
  scheduler_arg(NULL),
186
186
  lock_id(&main_lock_id),
187
187
  user_time(0),
 
188
  ha_data(plugin::num_trx_monitored_objects),
188
189
  arg_of_last_insert_id_function(false),
189
190
  first_successful_insert_id_in_prev_stmt(0),
190
191
  first_successful_insert_id_in_cur_stmt(0),
231
232
  file_id = 0;
232
233
  query_id= 0;
233
234
  warn_query_id= 0;
234
 
  memset(ha_data, 0, sizeof(ha_data));
235
235
  mysys_var= 0;
236
236
  dbug_sentry=Session_SENTRY_MAGIC;
237
237
  cleanup_done= abort_on_warning= no_warnings_for_error= false;