← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/lock.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:
drizzled/lock.cc
210
210
      break;
211
211
    }
212
212
 
213
 
    thd_proc_info(thd, "System lock");
 
213
    thd->set_proc_info("System lock");
214
214
    if (sql_lock->table_count && lock_external(thd, sql_lock->table,
215
215
                                               sql_lock->table_count))
216
216
    {
218
218
      reset_lock_data_and_free(&sql_lock);
219
219
      break;
220
220
    }
221
 
    thd_proc_info(thd, "Table lock");
 
221
    thd->set_proc_info("Table lock");
222
222
    /* Copy the lock data array. thr_multi_lock() reorders its contens. */
223
223
    memcpy(sql_lock->locks + sql_lock->lock_count, sql_lock->locks,
224
224
           sql_lock->lock_count * sizeof(*sql_lock->locks));
255
255
      thd->some_tables_deleted=0;
256
256
      break;
257
257
    }
258
 
    thd_proc_info(thd, 0);
 
258
    thd->set_proc_info(0);
259
259
 
260
260
    /* going to retry, unlock all tables */
261
261
    if (sql_lock->lock_count)
279
279
    if (wait_for_tables(thd))
280
280
      break;                                    // Couldn't open tables
281
281
  }
282
 
  thd_proc_info(thd, 0);
 
282
  thd->set_proc_info(0);
283
283
  if (thd->killed)
284
284
  {
285
285
    thd->send_kill_message();