← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_table.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/sql_table.cc
5194
5194
    }
5195
5195
    else
5196
5196
    {
5197
 
      from->sort.io_cache=(IO_CACHE*) my_malloc(sizeof(IO_CACHE),
5198
 
                                                MYF(MY_FAE | MY_ZEROFILL));
 
5197
      from->sort.io_cache=(IO_CACHE*) malloc(sizeof(IO_CACHE));
 
5198
      memset(from->sort.io_cache, 0, sizeof(IO_CACHE));
 
5199
 
5199
5200
      memset(&tables, 0, sizeof(tables));
5200
5201
      tables.table= from;
5201
5202
      tables.alias= tables.table_name= from->s->table_name.str;