← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/thr_lock.cc

Merge Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/thr_lock.cc
65
65
 
66
66
*/
67
67
 
68
 
#include "mysys/mysys_priv.h"
 
68
#include "drizzled/internal/mysys_priv.h"
69
69
 
70
70
#include "thr_lock.h"
71
 
#include <mystrings/m_string.h>
 
71
#include "drizzled/internal/m_string.h"
72
72
#include <errno.h>
73
73
#include <list>
74
74
 
769
769
  This is used to abort all locks for a specific thread
770
770
*/
771
771
 
772
 
bool thr_abort_locks_for_thread(THR_LOCK *lock, my_thread_id thread_id)
 
772
bool thr_abort_locks_for_thread(THR_LOCK *lock, uint64_t thread_id)
773
773
{
774
774
  THR_LOCK_DATA *data;
775
775
  bool found= false;