← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to storage/archive/ha_archive.cc

  • Committer: Brian Aker
  • Date: 2008-10-08 02:28:58 UTC
  • mfrom: (489.1.13 codestyle)
  • Revision ID: brian@tangent.org-20081008022858-ea8esagkxmn0dupc
Merge of Monty's work.

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/archive/ha_archive.cc
13
13
  along with this program; if not, write to the Free Software
14
14
  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
15
15
 
16
 
#ifdef USE_PRAGMA_IMPLEMENTATION
17
 
#pragma implementation        // gcc: Class implementation
18
 
#endif
19
16
 
20
17
#include <drizzled/common_includes.h>
21
18
#include <storage/myisam/myisam.h>
1371
1368
  const char *old_proc_info;
1372
1369
  uint64_t x;
1373
1370
 
1374
 
  old_proc_info= thd_proc_info(thd, "Checking table");
 
1371
  old_proc_info= get_thd_proc_info(thd);
 
1372
  set_thd_proc_info(thd, "Checking table");
1375
1373
  /* Flush any waiting data */
1376
1374
  pthread_mutex_lock(&share->mutex);
1377
1375
  azflush(&(share->archive_write), Z_SYNC_FLUSH);
1392
1390
      break;
1393
1391
  }
1394
1392
 
1395
 
  thd_proc_info(thd, old_proc_info);
 
1393
  set_thd_proc_info(thd, old_proc_info);
1396
1394
 
1397
1395
  if ((rc && rc != HA_ERR_END_OF_FILE))  
1398
1396
  {