← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/table_share.cc

  • Committer: Brian Aker
  • Date: 2010-06-03 09:06:27 UTC
  • mto: (1578.6.10 explain-drizzle)
  • mto: This revision was merged to the branch mainline in revision 1589.
  • Revision ID: brian@gir-2.local-20100603090627-6doyyne204s9wo1r
PAss through the code removing current_session

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/table_share.cc
1795
1795
    break;
1796
1796
  case 2:
1797
1797
    {
1798
 
      Cursor *cursor= 0;
1799
 
      const char *datext= "";
1800
 
 
1801
 
      if (db_type() != NULL)
1802
 
      {
1803
 
        if ((cursor= db_type()->getCursor(*this, current_session->mem_root)))
1804
 
        {
1805
 
          if (!(datext= *db_type()->bas_ext()))
1806
 
            datext= "";
1807
 
        }
1808
 
      }
1809
1798
      err_no= (db_errno == ENOENT) ? ER_FILE_NOT_FOUND : (db_errno == EAGAIN) ?
1810
1799
        ER_FILE_USED : ER_CANT_OPEN_FILE;
1811
 
      snprintf(buff, sizeof(buff), "%s%s", normalized_path.str,datext);
1812
 
      my_error(err_no,errortype, buff, db_errno);
1813
 
      delete cursor;
 
1800
      my_error(err_no, errortype, normalized_path.str, db_errno);
1814
1801
      break;
1815
1802
    }
1816
1803
  case 5: