← 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: 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/session.cc
2352
2352
  pthread_mutex_lock(&LOCK_xid_cache);
2353
2353
  if (hash_search(&xid_cache, xid->key(), xid->key_length()))
2354
2354
    res=0;
2355
 
  else if (!(xs=(XID_STATE *)my_malloc(sizeof(*xs), MYF(MY_WME))))
 
2355
  else if (!(xs=(XID_STATE *)malloc(sizeof(*xs))))
2356
2356
    res=1;
2357
2357
  else
2358
2358
  {
2602
2602
      }
2603
2603
      else
2604
2604
      {
2605
 
        m_memory= (unsigned char *) my_malloc(total_length, MYF(MY_WME));
 
2605
        m_memory= (unsigned char *) malloc(total_length);
2606
2606
        m_release_memory_on_destruction= true;
2607
2607
      }
2608
2608
    }