← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to libdrizzle-2.0/libdrizzle/query.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/query.cc
98
98
  if (query == NULL)
99
99
  {
100
100
    query= new drizzle_query_st;
101
 
    if (query == NULL)
102
 
    {
103
 
      drizzle_set_error(drizzle, "drizzle_query_create", "malloc");
104
 
      return NULL;
105
 
    }
106
 
 
107
101
    query->options|= DRIZZLE_CON_ALLOCATED;
108
102
  }
109
103
  else