← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/item_func.cc

  • Committer: Monty Taylor
  • Date: 2008-10-06 01:30:47 UTC
  • Revision ID: monty@inaugust.com-20081006013047-6m2ejc0c4peye2k9
Removed my_free(). It turns out that it had been def'd to ignore the flags passed to it in the second arg anyway. Gotta love that.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/item_func.cc
2739
2739
    {
2740
2740
      if (my_hash_insert(&hash_user_locks,(uchar*) this))
2741
2741
      {
2742
 
        my_free(key,MYF(0));
 
2742
        free(key);
2743
2743
        key=0;
2744
2744
      }
2745
2745
    }
2749
2749
    if (key)
2750
2750
    {
2751
2751
      hash_delete(&hash_user_locks,(uchar*) this);
2752
 
      my_free(key, MYF(0));
 
2752
      free(key);
2753
2753
    }
2754
2754
    pthread_cond_destroy(&cond);
2755
2755
  }
2968
2968
    memcpy(entry->name.str, name.str, name.length+1);
2969
2969
    if (my_hash_insert(hash,(uchar*) entry))
2970
2970
    {
2971
 
      my_free((char*) entry,MYF(0));
 
2971
      free((char*) entry);
2972
2972
      return 0;
2973
2973
    }
2974
2974
  }
3076
3076
  {
3077
3077
    char *pos= (char*) entry+ ALIGN_SIZE(sizeof(user_var_entry));
3078
3078
    if (entry->value && entry->value != pos)
3079
 
      my_free(entry->value,MYF(0));
 
3079
      free(entry->value);
3080
3080
    entry->value= 0;
3081
3081
    entry->length= 0;
3082
3082
  }
3091
3091
      if (entry->value != pos)
3092
3092
      {
3093
3093
        if (entry->value)
3094
 
          my_free(entry->value,MYF(0));
 
3094
          free(entry->value);
3095
3095
        entry->value=pos;
3096
3096
      }
3097
3097
    }