← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/session.cc

  • Committer: Brian Aker
  • Date: 2011-01-16 20:38:08 UTC
  • mto: (2088.1.1 merge)
  • mto: This revision was merged to the branch mainline in revision 2089.
  • Revision ID: brian@gir-3-20110116203808-dl1dvpoarmkug1no
Entire convert over to time_t.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/session.cc
298
298
  m_internal_handler= handler;
299
299
}
300
300
 
301
 
bool Session::handle_error(uint32_t sql_errno, const char *message,
302
 
                       DRIZZLE_ERROR::enum_warning_level level)
 
301
bool Session::handle_error(drizzled::error_t sql_errno, const char *message,
 
302
                           DRIZZLE_ERROR::enum_warning_level level)
303
303
{
304
304
  if (m_internal_handler)
305
305
  {
954
954
  return (result->send_fields(field_list));
955
955
}
956
956
 
957
 
void select_result::send_error(uint32_t errcode, const char *err)
 
957
void select_result::send_error(drizzled::error_t errcode, const char *err)
958
958
{
959
959
  my_message(errcode, err, MYF(0));
960
960
}
963
963
  Handling writing to file
964
964
************************************************************************/
965
965
 
966
 
void select_to_file::send_error(uint32_t errcode,const char *err)
 
966
void select_to_file::send_error(drizzled::error_t errcode,const char *err)
967
967
{
968
968
  my_message(errcode, err, MYF(0));
969
969
  if (file > 0)
1618
1618
 
1619
1619
void Session::send_kill_message() const
1620
1620
{
1621
 
  int err= killed_errno();
1622
 
  if (err)
 
1621
  drizzled::error_t err= static_cast<drizzled::error_t>(killed_errno());
 
1622
  if (err != EE_OK)
1623
1623
    my_message(err, ER(err), MYF(0));
1624
1624
}
1625
1625