← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/scheduler.cc

  • Committer: Brian Aker
  • Date: 2008-12-05 03:17:16 UTC
  • mfrom: (641.3.11 devel)
  • Revision ID: brian@tangent.org-20081205031716-r65xkzugjylmvv1h
Monty merge (a couple of alterations for malloc()).

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/scheduler.cc
123
123
 
124
124
bool session_scheduler::init(Session *parent_session)
125
125
{
126
 
  io_event=
127
 
    (struct event*)my_malloc(sizeof(*io_event),MYF(MY_ZEROFILL|MY_WME));
 
126
  io_event= (struct event*)malloc(sizeof(*io_event));
128
127
    
129
128
  if (!io_event)
130
129
  {
131
130
    sql_print_error(_("Memory allocation error in session_scheduler::init\n"));
132
131
    return true;
133
132
  }
134
 
  
 
133
  memset(io_event, 0, sizeof(*io_event));
 
134
 
135
135
  event_set(io_event, net_get_sd(&(parent_session->net)), EV_READ, 
136
136
            libevent_io_callback, (void*)parent_session);
137
137