← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to libdrizzle/column.cc

  • Committer: Mark Atwood
  • Date: 2011-12-30 22:59:59 UTC
  • mfrom: (2478.1.3 drizzle-build)
  • Revision ID: me@mark.atwood.name-20111230225959-m3wdvqiymv3a4q2w
merge lp:~brianaker/drizzle/yacc-merge

Show diffs side-by-side

added added

removed removed

Lines of Context:
libdrizzle/column.cc
41
41
 * @brief Column definitions
42
42
 */
43
43
 
44
 
#include <libdrizzle-1.0/common.h>
 
44
#include <libdrizzle/common.h>
45
45
 
46
46
/*
47
47
 * Private variables.
365
365
    column= new (std::nothrow) (drizzle_column_st);
366
366
    if (column == NULL)
367
367
    {
368
 
      drizzle_set_error(result->con->drizzle, "drizzle_column_create",
369
 
                        "malloc");
 
368
      drizzle_set_error(result->con->drizzle, __func__, "Failed to allocate.");
370
369
      return NULL;
371
370
    }
372
371
 
700
699
    result->column_buffer= new (std::nothrow) drizzle_column_st[result->column_count];
701
700
    if (result->column_buffer == NULL)
702
701
    {
703
 
      drizzle_set_error(result->con->drizzle, __func__, "malloc");
 
702
      drizzle_set_error(result->con->drizzle, __func__, "Failed to allocate.");
704
703
 
705
704
      return DRIZZLE_RETURN_MEMORY;
706
705
    }