← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/statement/drop_table.cc

  • Committer: Stewart Smith
  • Date: 2011-01-14 05:20:34 UTC
  • mto: (2086.1.3 build)
  • mto: This revision was merged to the branch mainline in revision 2087.
  • Revision ID: stewart@flamingspork.com-20110114052034-b45vpdmk4a8l70c2
just a syntax fix

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/statement/drop_table.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
33
33
 delete (drop) tables.
34
34
 
35
35
  SYNOPSIS
36
 
   mysql_rm_table()
 
36
   rm_table()
37
37
   session                      Thread handle
38
38
   tables               List of tables to delete
39
39
   if_exists            If 1, don't give error if one table doesn't exists
53
53
 
54
54
*/
55
55
 
56
 
static bool mysql_rm_table(Session *session, TableList *tables, bool if_exists, bool drop_temporary)
 
56
static bool rm_table(Session *session, TableList *tables, bool if_exists, bool drop_temporary)
57
57
{
58
58
  bool error, need_start_waiting= false;
59
59
 
61
61
 
62
62
  if (not drop_temporary)
63
63
  {
64
 
    if (not (need_start_waiting= !wait_if_global_read_lock(session, false, true)))
 
64
    if (not (need_start_waiting= not session->wait_if_global_read_lock(false, true)))
65
65
      return true;
66
66
  }
67
67
 
68
68
  /*
69
 
    Acquire LOCK_open after wait_if_global_read_lock(). If we would hold
70
 
    LOCK_open during wait_if_global_read_lock(), other threads could not
 
69
    Acquire table::Cache::singleton().mutex() after wait_if_global_read_lock(). If we would hold
 
70
    table::Cache::singleton().mutex() during wait_if_global_read_lock(), other threads could not
71
71
    close their tables. This would make a pretty deadlock.
72
72
  */
73
 
  error= mysql_rm_table_part2(session, tables, if_exists, drop_temporary);
 
73
  error= rm_table_part2(session, tables, if_exists, drop_temporary);
74
74
 
75
75
  if (need_start_waiting)
76
 
    start_waiting_global_read_lock(session);
 
76
  {
 
77
    session->startWaitingGlobalReadLock();
 
78
  }
77
79
 
78
80
  if (error)
79
81
    return true;
97
99
    }
98
100
  }
99
101
 
100
 
  /* DDL and binlog write order protected by LOCK_open */
101
 
  bool res= mysql_rm_table(session,
102
 
                           first_table,
103
 
                           drop_if_exists,
104
 
                           drop_temporary);
 
102
  /* DDL and binlog write order protected by table::Cache::singleton().mutex() */
 
103
  bool res= rm_table(session, first_table, drop_if_exists, drop_temporary);
 
104
 
105
105
  return res;
106
106
}
107
107