← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/statement/unlock_tables.cc

  • Committer: Lee Bieber
  • Date: 2011-03-13 16:37:38 UTC
  • mfrom: (2227.4.18 session2)
  • Revision ID: kalebral@gmail.com-20110313163738-7ti21zk40o2xi3ew
Merge Olaf - Refactor Session

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/statement/unlock_tables.cc
1
1
/* -*- mode: c++; c-basic-offset: 2; indent-tabs-mode: nil; -*-
2
2
 *  vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
3
3
 *
4
 
 *  Copyright (C) 2009 Sun Microsystems
 
4
 *  Copyright (C) 2009 Sun Microsystems, Inc.
5
5
 *
6
6
 *  This program is free software; you can redistribute it and/or modify
7
7
 *  it under the terms of the GNU General Public License as published by
18
18
 *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
19
19
 */
20
20
 
21
 
#include "config.h"
 
21
#include <config.h>
22
22
#include <drizzled/show.h>
23
23
#include <drizzled/session.h>
24
24
#include <drizzled/lock.h>
35
35
     done FLUSH TABLES WITH READ LOCK + BEGIN. If this assumption becomes
36
36
     false, mysqldump will not work.
37
37
   */
38
 
  if (session->isGlobalReadLock())
39
 
  {
40
 
    session->unlockGlobalReadLock();
41
 
  }
42
 
  session->my_ok();
 
38
  if (session().isGlobalReadLock())
 
39
  {
 
40
    session().unlockGlobalReadLock();
 
41
    session().my_ok();
 
42
  }
 
43
  else
 
44
  {
 
45
    my_error(ER_NO_LOCK_HELD, MYF(0));
 
46
  }
43
47
 
44
48
  return false;
45
49
}