← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_table.cc

Merge Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_table.cc
1143
1143
    return(true);
1144
1144
  }
1145
1145
 
1146
 
  (*key_info_buffer)= key_info= (KEY*) sql_calloc(sizeof(KEY) * (*key_count));
1147
 
  key_part_info=(KEY_PART_INFO*) sql_calloc(sizeof(KEY_PART_INFO)*key_parts);
 
1146
  (*key_info_buffer)= key_info= (KEY*) memory::sql_calloc(sizeof(KEY) * (*key_count));
 
1147
  key_part_info=(KEY_PART_INFO*) memory::sql_calloc(sizeof(KEY_PART_INFO)*key_parts);
1148
1148
  if (!*key_info_buffer || ! key_part_info)
1149
1149
    return(true);                               // Out of memory
1150
1150
 
1822
1822
    *buff_end= '_';
1823
1823
    int10_to_str(i, buff_end+1, 10);
1824
1824
    if (!check_if_keyname_exists(buff,start,end))
1825
 
      return sql_strdup(buff);
 
1825
      return memory::sql_strdup(buff);
1826
1826
  }
1827
1827
  return (char*) "not_specified";               // Should never happen
1828
1828
}