← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/set_var.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/set_var.cc
2949
2949
{
2950
2950
  KEY_CACHE *key_cache;
2951
2951
  
2952
 
  if ((key_cache= (KEY_CACHE*) my_malloc(sizeof(KEY_CACHE),
2953
 
                                             MYF(MY_ZEROFILL | MY_WME))))
 
2952
  if ((key_cache= (KEY_CACHE*) malloc(sizeof(KEY_CACHE))))
2954
2953
  {
 
2954
    memset(key_cache, 0, sizeof(KEY_CACHE));
2955
2955
    if (!new NAMED_LIST(&key_caches, name, length, (unsigned char*) key_cache))
2956
2956
    {
2957
2957
      free((char*) key_cache);