← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/user_locks/get_locks.cc

  • Committer: Lee Bieber
  • Date: 2010-11-20 01:33:21 UTC
  • mfrom: (1878.10.4 drizzle_bug665252)
  • Revision ID: kalebral@gmail.com-20101120013321-7nk9lq4nnr20zk6b
Merge Billy - removed my_getsysdate, my_micro_time and my_micro_time_and_time and replaced with boost::date_time for compatibility.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/user_locks/get_locks.cc
40
40
    }
41
41
    else
42
42
    {
43
 
      my_error(drizzled::ER_USER_LOCKS_INVALID_NAME_LOCK, MYF(0));
44
 
      return 0;
45
 
    }
46
 
  }
47
 
 
48
 
  boost::tribool result;
49
 
  {
50
 
    boost::this_thread::restore_interruption dl(getSession().getThreadInterupt());
51
 
 
52
 
    try {
53
 
      result= user_locks::Locks::getInstance().lock(getSession().getSessionId(), list_of_locks);
54
 
    }
55
 
    catch(boost::thread_interrupted const& error)
56
 
    {
57
 
      my_error(drizzled::ER_QUERY_INTERRUPTED, MYF(0));
58
43
      null_value= true;
59
 
 
60
44
      return 0;
61
45
    }
62
46
  }
63
47
 
 
48
  null_value= false;
 
49
 
 
50
 
 
51
  boost::tribool result= user_locks::Locks::getInstance().lock(getSession().getSessionId(), list_of_locks);
 
52
 
64
53
  if (boost::indeterminate(result))
65
54
    null_value= true;
66
55
 
79
68
      list->insert(*iter);
80
69
    }
81
70
 
82
 
    null_value= false;
83
 
 
84
71
    return 1;
85
72
  }
86
73