← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to libdrizzle-2.0/libdrizzle/column.cc

Merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
libdrizzle-2.0/libdrizzle/column.cc
357
357
  if (column == NULL)
358
358
  {
359
359
    column= new drizzle_column_st;
360
 
    if (column == NULL)
361
 
    {
362
 
      drizzle_set_error(result->con->drizzle, "drizzle_column_create",
363
 
                        "malloc");
364
 
      return NULL;
365
 
    }
366
 
 
367
360
    column->result = result;
368
361
    /* SET BELOW: column->next */
369
362
    column->prev = NULL;
558
551
    }
559
552
 
560
553
    result->column_buffer= new drizzle_column_st[result->column_count];
561
 
    if (result->column_buffer == NULL)
562
 
    {
563
 
      drizzle_set_error(result->con->drizzle, "drizzle_column_buffer",
564
 
                        "malloc");
565
 
      return DRIZZLE_RETURN_MEMORY;
566
 
    }
567
554
  }
568
555
 
569
556
  /* No while body, just keep calling to buffer columns. */