← Back to branch summary

~stewart/drizzle/seapitester-improve

« back to all changes in this revision

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

  • Committer: Mark Atwood
  • Date: 2011-06-16 15:05:43 UTC
  • mfrom: (2318.4.15 refactor10)
  • Revision ID: me@mark.atwood.name-20110616150543-ydrgmzb685nzcjr9
merge lp:~olafvdspek/drizzle/refactor10

Show diffs side-by-side

added added

removed removed

Lines of Context:
libdrizzle-2.0/libdrizzle/result.cc
52
52
  if (result == NULL)
53
53
  {
54
54
    result= new drizzle_result_st;
55
 
    if (result == NULL)
56
 
    {
57
 
      drizzle_set_error(con->drizzle, "drizzle_result_create", "malloc");
58
 
      return NULL;
59
 
    }
60
 
 
61
55
    result->options|= DRIZZLE_RESULT_ALLOCATED;
62
56
  }
63
57
  else
281
275
 
282
276
    if (result->row_list == NULL)
283
277
    {
284
 
      result->row_list= new (std::nothrow) drizzle_row_list_t;
285
 
      if (result->row_list == NULL)
286
 
      {
287
 
        drizzle_row_free(result, row);
288
 
        drizzle_set_error(result->con->drizzle, "drizzle_result_buffer",
289
 
                          "realloc");
290
 
        return DRIZZLE_RETURN_MEMORY;
291
 
      }
 
278
      result->row_list= new drizzle_row_list_t;
292
279
    }
293
280
 
294
281
 
295
282
    if (result->field_sizes_list == NULL)
296
283
    {
297
 
      result->field_sizes_list= new (std::nothrow) drizzle_field_sizes_list_t;
298
 
      if (result->field_sizes_list == NULL)
299
 
      {
300
 
        drizzle_row_free(result, row);
301
 
        drizzle_set_error(result->con->drizzle, "drizzle_result_buffer",
302
 
                          "realloc");
303
 
        return DRIZZLE_RETURN_MEMORY;
304
 
      }
 
284
      result->field_sizes_list= new drizzle_field_sizes_list_t;
305
285
    }
306
286
 
307
287
    result->row_list->push_back(row);