← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to libdrizzle-2.0/drizzle.cc

  • Committer: Brian Aker
  • Date: 2011-11-23 21:52:22 UTC
  • mfrom: (2461.1.4 drizzle-build)
  • mto: This revision was merged to the branch mainline in revision 2465.
  • Revision ID: brian@tangent.org-20111123215222-r9qdzhzch2b8jj2b
Break out options, first pass.

Show diffs side-by-side

added added

removed removed

Lines of Context:
libdrizzle-2.0/drizzle.cc
283
283
  if (con == NULL)
284
284
  {
285
285
    con= new (std::nothrow) drizzle_con_st;
286
 
    con->options= DRIZZLE_CON_ALLOCATED;
 
286
    con->_options.is_allocated= true;
287
287
  }
288
288
  else
289
289
  {
415
415
  }
416
416
  con->drizzle->con_count--;
417
417
 
418
 
  if (con->options & DRIZZLE_CON_ALLOCATED)
 
418
  if (con->_options.is_allocated)
419
419
  {
420
420
    delete con;
421
421
  }