← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/statement/replace_select.cc

  • Committer: lbieber
  • Date: 2010-09-07 22:29:56 UTC
  • mfrom: (1747.1.3 build)
  • Revision ID: lbieber@orisndriz03-20100907222956-d60u695b7hx3zs0d
Merge Andrew - bug 597778 - Timestamp cannot reliably store leap seconds, so don't try. Leave that to datetime only
Merge Andrew - bug 621862 - Add / clean-up error messages for unireg_abort
Merge Andrew - bug 629563 - Drop the broken --mysql options and Change the --protocol option to accept 'mysql' or 'drizzle' ('mysql' currently default)

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/statement/replace_select.cc
47
47
 
48
48
  unit->set_limit(select_lex);
49
49
 
50
 
  if (session->wait_if_global_read_lock(false, true))
 
50
  if (wait_if_global_read_lock(session, false, true))
51
51
  {
52
52
    return true;
53
53
  }
96
96
     Release the protection against the global read lock and wake
97
97
     everyone, who might want to set a global read lock.
98
98
   */
99
 
  session->startWaitingGlobalReadLock();
 
99
  start_waiting_global_read_lock(session);
100
100
 
101
101
  return res;
102
102
}