← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to mysys/my_lib.cc

  • Committer: Brian Aker
  • Date: 2008-11-07 23:16:58 UTC
  • mfrom: (575.1.14 devel)
  • Revision ID: brian@tangent.org-20081107231658-fboahr524d1or2ya
Merge from Monty.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mysys/my_lib.cc
96
96
 
97
97
  dirp = opendir(directory_file_name(tmp_path,(char *) path));
98
98
  if (dirp == NULL || 
99
 
      ! (buffer= my_malloc(ALIGN_SIZE(sizeof(MY_DIR)) + 
100
 
                           ALIGN_SIZE(sizeof(DYNAMIC_ARRAY)) +
101
 
                           sizeof(MEM_ROOT), MyFlags)))
 
99
      ! (buffer= (char *) my_malloc(ALIGN_SIZE(sizeof(MY_DIR)) + 
 
100
                                    ALIGN_SIZE(sizeof(DYNAMIC_ARRAY)) +
 
101
                                    sizeof(MEM_ROOT), MyFlags)))
102
102
    goto error;
103
103
 
104
104
  dir_entries_storage= (DYNAMIC_ARRAY*)(buffer + ALIGN_SIZE(sizeof(MY_DIR)));