← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/statement/delete.cc

  • Committer: Monty Taylor
  • Date: 2009-10-06 19:20:36 UTC
  • mto: This revision was merged to the branch mainline in revision 1184.
  • Revision ID: mordred@inaugust.com-20091006192036-3n7cu7gumica4bkz
Added missing include guards. Removed server_includes.h from header.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/statement/delete.cc
18
18
 *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
19
19
 */
20
20
 
21
 
#include "config.h"
 
21
#include <drizzled/server_includes.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(session->getQueryString()->c_str());
 
33
  DRIZZLE_DELETE_START(session->query);
34
34
  TableList *first_table= (TableList *) session->lex->select_lex.table_list.first;
35
35
  TableList *all_tables= session->lex->query_tables;
36
36
  Select_Lex *select_lex= &session->lex->select_lex;
40
40
  unit->set_limit(select_lex);
41
41
  bool need_start_waiting= false;
42
42
 
43
 
  if (! (need_start_waiting= not session->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
  }
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
 
  session->startWaitingGlobalReadLock();
57
 
 
 
56
  start_waiting_global_read_lock(session);
58
57
  return res;
59
58
}
60
59