← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to libdrizzle/libdrizzle.c

  • Committer: Monty Taylor
  • Date: 2008-09-14 02:48:07 UTC
  • mto: This revision was merged to the branch mainline in revision 387.
  • Revision ID: monty@inaugust.com-20080914024807-gk23alauwr9qayns
More mysys removal from libdrizzle. Got rid of MEM_ROOT related stuff.

Show diffs side-by-side

added added

removed removed

Lines of Context:
libdrizzle/libdrizzle.c
305
305
    return NULL;
306
306
 
307
307
  drizzle->field_count= (uint) query->rows;
308
 
  return unpack_fields(query,&drizzle->field_alloc, drizzle->field_count, 1);
 
308
  return unpack_fields(query, drizzle->field_count, 1);
309
309
}
310
310
 
311
311
 
338
338
  memset(result, 0, sizeof(DRIZZLE_RES));
339
339
 
340
340
  result->methods= drizzle->methods;
341
 
  result->field_alloc=drizzle->field_alloc;
342
341
  drizzle->fields=0;
343
342
  result->field_count = drizzle->field_count;
344
343
  result->fields= fields;
362
361
  field_count=(uint) net_field_length(&pos);
363
362
  if (!(fields = (*drizzle->methods->read_rows)(drizzle,(DRIZZLE_FIELD*) 0, 7)))
364
363
    return(NULL);
365
 
  if (!(drizzle->fields=unpack_fields(fields,&drizzle->field_alloc,field_count,0)))
 
364
  if (!(drizzle->fields=unpack_fields(fields, field_count, 0)))
366
365
    return(0);
367
366
  drizzle->status=DRIZZLE_STATUS_GET_RESULT;
368
367
  drizzle->field_count=field_count;