← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/locking/global.cc

  • Committer: Brian Aker
  • Date: 2011-01-04 22:27:38 UTC
  • mfrom: (2041.3.16 session-fix)
  • mto: This revision was merged to the branch mainline in revision 2055.
  • Revision ID: brian@tangent.org-20110104222738-4r3hrsxrlbuildrg
Merge in cleanup of error messages.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/locking/global.cc
252
252
      if (sql_lock->sizeTable())
253
253
        unlock_external(sql_lock->getTable(), sql_lock->sizeTable());
254
254
      reset_lock_data_and_free(&sql_lock);
255
 
      my_error(rc, MYF(0));
 
255
      my_error(static_cast<drizzled::drizzled_error_code>(rc), MYF(0));
256
256
      break;
257
257
    }
258
258
    else if (rc == 1)                           /* aborted */
874
874
 
875
875
static void print_lock_error(int error, const char *table)
876
876
{
877
 
  int textno;
 
877
  drizzled::drizzled_error_code textno;
878
878
 
879
879
  switch (error) {
880
880
  case HA_ERR_LOCK_WAIT_TIMEOUT: