← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/archive/ha_archive.cc

  • Committer: Lee Bieber
  • Date: 2011-02-10 21:02:41 UTC
  • mfrom: (2154.1.3 build)
  • Revision ID: kalebral@gmail.com-20110210210241-jouae2uw2pwv6bac
Merge Patrick - 715885: dbqp needs to return non-zero if tests fail
Merge Stewart - 715539: (get|set)_session_proc_info() still exists
Merge Stewart - 715575: misc session_foo() functions exist - should be methods in Session
Merge Stewart - 712843: SAVEPOINT after rollback due to deadlock with autocommit=off in transaction will call startTransaction with an existing transaction where one shouldn't exist

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/archive/ha_archive.cc
1084
1084
 
1085
1085
    if ((lock_type >= TL_WRITE_CONCURRENT_INSERT &&
1086
1086
         lock_type <= TL_WRITE)
1087
 
        && !session_tablespace_op(session))
 
1087
        && ! session->doing_tablespace_operation())
1088
1088
      lock_type = TL_WRITE_ALLOW_WRITE;
1089
1089
 
1090
1090
    /*
1212
1212
  int rc= 0;
1213
1213
  const char *old_proc_info;
1214
1214
 
1215
 
  old_proc_info= get_session_proc_info(session);
1216
 
  set_session_proc_info(session, "Checking table");
 
1215
  old_proc_info= session->get_proc_info();
 
1216
  session->set_proc_info("Checking table");
1217
1217
  /* Flush any waiting data */
1218
1218
  pthread_mutex_lock(&share->mutex());
1219
1219
  azflush(&(share->archive_write), Z_SYNC_FLUSH);
1234
1234
      break;
1235
1235
  }
1236
1236
 
1237
 
  set_session_proc_info(session, old_proc_info);
 
1237
  session->set_proc_info(old_proc_info);
1238
1238
 
1239
1239
  if ((rc && rc != HA_ERR_END_OF_FILE))
1240
1240
  {