← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to storage/myisam/mf_keycaches.cc

  • Committer: Monty Taylor
  • Date: 2009-03-22 04:46:43 UTC
  • mfrom: (960.3.1 mordred)
  • mto: (960.5.2 mordred)
  • mto: This revision was merged to the branch mainline in revision 961.
  • Revision ID: mordred@inaugust.com-20090322044643-efyptdz0hpfjfp0m
Merged the other way.

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/myisam/mf_keycaches.cc
68
68
  This function is called by the hash object on delete
69
69
*/
70
70
 
71
 
static void safe_hash_entry_free(SAFE_HASH_ENTRY *entry)
 
71
extern "C"
 
72
void safe_hash_entry_free(void *entry)
72
73
{
73
 
  free((unsigned char*) entry);
 
74
  free(entry);
74
75
  return;
75
76
}
76
77
 
109
110
{
110
111
  if (hash_init(&hash->hash, &my_charset_bin, elements,
111
112
                0, 0, (hash_get_key) safe_hash_entry_get,
112
 
                (void (*)(void*)) safe_hash_entry_free, 0))
 
113
                safe_hash_entry_free, 0))
113
114
  {
114
115
    hash->default_value= 0;
115
116
    return(1);