← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/error.cc

  • Committer: Brian Aker
  • Date: 2009-09-26 02:16:50 UTC
  • mfrom: (1124.2.11 bug-fixes)
  • Revision ID: brian@gaz-20090926021650-u2pc495bh4vpjt7i
Merge for bug fixes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/error.cc
1418
1418
 
1419
1419
const char * error_message(unsigned int code)
1420
1420
{
1421
 
  return drizzled_error_messages[code-ER_ERROR_FIRST];
 
1421
  /**
 
1422
   if the connection is killed, code is 2
 
1423
   See lp bug# 435619
 
1424
   */
 
1425
  if ((code > ER_ERROR_FIRST) )
 
1426
   {
 
1427
     return drizzled_error_messages[code-ER_ERROR_FIRST];
 
1428
   }
 
1429
  else
 
1430
    return drizzled_error_messages[ER_UNKNOWN_ERROR - ER_ERROR_FIRST];
1422
1431
}
1423
1432
 
1424
1433