~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/statement/unlock_tables.cc

  • Committer: Mark Atwood
  • Date: 2011-08-11 03:05:03 UTC
  • mfrom: (2385.1.12 refactor4)
  • Revision ID: me@mark.atwood.name-20110811030503-rp9xjihc5x3y0x4q
merge lp:~olafvdspek/drizzle/refactor4

Show diffs side-by-side

added added

removed removed

Lines of Context:
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 (getSession()->isGlobalReadLock())
39
 
  {
40
 
    getSession()->unlockGlobalReadLock();
41
 
  }
42
 
  getSession()->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
}