← 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: 2010-04-01 04:50:49 UTC
  • mfrom: (1283.28.35)
  • mto: (1283.38.1)
  • mto: This revision was merged to the branch mainline in revision 1536.
  • Revision ID: stewart@flamingspork.com-20100401045049-ja409wya5jjyw8uy
Merged embedded-innodb-position-rnd-pos into embedded-innodb-autoincrement.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/statement/drop_table.cc
59
59
 
60
60
  /* mark for close and remove all cached entries */
61
61
 
62
 
  if (! drop_temporary)
 
62
  if (not drop_temporary)
63
63
  {
64
 
    if (!(need_start_waiting= !wait_if_global_read_lock(session, false, true)))
 
64
    if (not (need_start_waiting= !wait_if_global_read_lock(session, false, true)))
65
65
      return true;
66
66
  }
67
67
 
88
88
  TableList *first_table= (TableList *) session->lex->select_lex.table_list.first;
89
89
  TableList *all_tables= session->lex->query_tables;
90
90
  assert(first_table == all_tables && first_table != 0);
91
 
  if (! drop_temporary)
 
91
 
 
92
  if (not drop_temporary)
92
93
  {
93
 
    if (! session->endActiveTransaction())
 
94
    if (not session->endActiveTransaction())
94
95
    {
95
96
      return true;
96
97
    }
97
98
  }
 
99
 
98
100
  /* DDL and binlog write order protected by LOCK_open */
99
101
  bool res= mysql_rm_table(session,
100
102
                           first_table,