← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/session.cc

  • Committer: Nathan Williams
  • Date: 2009-07-23 21:28:28 UTC
  • mto: (1101.1.2 merge)
  • mto: This revision was merged to the branch mainline in revision 1106.
  • Revision ID: nathanlws@gmail.com-20090723212828-lze3nivz8hd5f4g1
Took Sql_alloc inheritance off of Tmp_Table_Param and changed calls to session->c/alloc to new.

Removed init/cleanup functions on the class and put that logic in constructor and destructor.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/session.cc
1588
1588
  return false;
1589
1589
}
1590
1590
 
1591
 
/****************************************************************************
1592
 
  Tmp_Table_Param
1593
 
****************************************************************************/
1594
 
 
1595
 
void Tmp_Table_Param::init()
1596
 
{
1597
 
  field_count= sum_func_count= func_count= hidden_field_count= 0;
1598
 
  group_parts= group_length= group_null_parts= 0;
1599
 
  quick_group= 1;
1600
 
  table_charset= 0;
1601
 
  precomputed_group_by= 0;
1602
 
  bit_fields_as_long= 0;
1603
 
}
1604
 
 
1605
 
void Tmp_Table_Param::cleanup(void)
1606
 
{
1607
 
  /* Fix for Intel compiler */
1608
 
  if (copy_field)
1609
 
  {
1610
 
    delete [] copy_field;
1611
 
    save_copy_field= copy_field= 0;
1612
 
  }
1613
 
}
1614
 
 
1615
1591
void Session::send_kill_message() const
1616
1592
{
1617
1593
  int err= killed_errno();