← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/statement/delete.cc

  • Committer: Jay Pipes
  • Date: 2010-03-09 20:02:29 UTC
  • mto: This revision was merged to the branch mainline in revision 1339.
  • Revision ID: jpipes@serialcoder-20100309200229-dfrliy4fads9vyf4
https://launchpad.net/bugs/535296
Fixes Bug #535296 by only incrementing ha_commit_count when its a normal transaction commit.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/statement/delete.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, Inc.
 
4
 *  Copyright (C) 2009 Sun Microsystems
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>
30
30
 
31
31
bool statement::Delete::execute()
32
32
{
33
 
  DRIZZLE_DELETE_START(getSession()->getQueryString()->c_str());
34
 
  TableList *first_table= (TableList *) getSession()->getLex()->select_lex.table_list.first;
35
 
  TableList *all_tables= getSession()->getLex()->query_tables;
36
 
  Select_Lex *select_lex= &getSession()->getLex()->select_lex;
37
 
  Select_Lex_Unit *unit= &getSession()->getLex()->unit;
 
33
  DRIZZLE_DELETE_START(session->query.c_str());
 
34
  TableList *first_table= (TableList *) session->lex->select_lex.table_list.first;
 
35
  TableList *all_tables= session->lex->query_tables;
 
36
  Select_Lex *select_lex= &session->lex->select_lex;
 
37
  Select_Lex_Unit *unit= &session->lex->unit;
38
38
  assert(first_table == all_tables && first_table != 0);
39
39
  assert(select_lex->offset_limit == 0);
40
40
  unit->set_limit(select_lex);
41
41
  bool need_start_waiting= false;
42
42
 
43
 
  if (! (need_start_waiting= not getSession()->wait_if_global_read_lock(0, 1)))
 
43
  if (! (need_start_waiting= ! wait_if_global_read_lock(session, 0, 1)))
44
44
  {
45
45
    return true;
46
46
  }
47
47
 
48
 
  bool res= delete_query(getSession(), all_tables, select_lex->where,
 
48
  bool res= mysql_delete(session, all_tables, select_lex->where,
49
49
                         &select_lex->order_list,
50
50
                         unit->select_limit_cnt, select_lex->options,
51
51
                         false);
53
53
    Release the protection against the global read lock and wake
54
54
    everyone, who might want to set a global read lock.
55
55
  */
56
 
  getSession()->startWaitingGlobalReadLock();
57
 
 
 
56
  start_waiting_global_read_lock(session);
58
57
  return res;
59
58
}
60
59