← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/statement/rename_table.cc

  • Committer: Lee Bieber
  • Date: 2011-03-13 16:37:38 UTC
  • mfrom: (2227.4.18 session2)
  • Revision ID: kalebral@gmail.com-20110313163738-7ti21zk40o2xi3ew
Merge Olaf - Refactor Session

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/statement/rename_table.cc
37
37
  assert(first_table == all_tables && first_table != 0);
38
38
  TableList *table;
39
39
 
40
 
  if (getSession()->inTransaction())
 
40
  if (session().inTransaction())
41
41
  {
42
42
    my_error(ER_TRANSACTIONAL_DDL_NOT_SUPPORTED, MYF(0));
43
43
    return true;
71
71
    Avoid problems with a rename on a table that we have locked or
72
72
    if the user is trying to to do this in a transcation context
73
73
  */
74
 
  if (getSession()->inTransaction())
 
74
  if (session().inTransaction())
75
75
  {
76
76
    my_message(ER_LOCK_OR_ACTIVE_TRANSACTION, ER(ER_LOCK_OR_ACTIVE_TRANSACTION), MYF(0));
77
77
    return true;
78
78
  }
79
79
 
80
 
  if (getSession()->wait_if_global_read_lock(false, true))
 
80
  if (session().wait_if_global_read_lock(false, true))
81
81
    return true;
82
82
 
83
83
  {
84
84
    boost::mutex::scoped_lock scopedLock(table::Cache::singleton().mutex()); /* Rename table lock for exclusive access */
85
85
 
86
 
    if (not getSession()->lock_table_names_exclusively(table_list))
 
86
    if (not session().lock_table_names_exclusively(table_list))
87
87
    {
88
88
      error= false;
89
89
      ren_table= renameTablesInList(table_list, false);
117
117
  if (not error)
118
118
  {
119
119
    TransactionServices &transaction_services= TransactionServices::singleton();
120
 
    transaction_services.rawStatement(*getSession(),
121
 
                                      *getSession()->getQueryString(),
122
 
                                      *getSession()->schema());        
123
 
    getSession()->my_ok();
 
120
    transaction_services.rawStatement(session(),
 
121
                                      *session().getQueryString(),
 
122
                                      *session().schema());        
 
123
    session().my_ok();
124
124
  }
125
125
 
126
 
  getSession()->startWaitingGlobalReadLock();
 
126
  session().startWaitingGlobalReadLock();
127
127
 
128
128
  return error;
129
129
}
160
160
 
161
161
  identifier::Table old_identifier(ren_table->getSchemaName(), old_alias, message::Table::STANDARD);
162
162
 
163
 
  if (not (table_message= plugin::StorageEngine::getTableMessage(*getSession(), old_identifier)))
 
163
  if (not (table_message= plugin::StorageEngine::getTableMessage(session(), old_identifier)))
164
164
  {
165
165
    my_error(ER_TABLE_UNKNOWN, old_identifier);
166
166
    return true;
167
167
  }
168
168
 
169
 
  engine= plugin::StorageEngine::findByName(*getSession(), table_message->engine().name());
 
169
  engine= plugin::StorageEngine::findByName(session(), table_message->engine().name());
170
170
 
171
171
  identifier::Table new_identifier(new_db, new_alias, message::Table::STANDARD);
172
 
  if (plugin::StorageEngine::doesTableExist(*getSession(), new_identifier))
 
172
  if (plugin::StorageEngine::doesTableExist(session(), new_identifier))
173
173
  {
174
174
    my_error(ER_TABLE_EXISTS_ERROR, new_identifier);
175
175
    return 1; // This can't be skipped
176
176
  }
177
177
 
178
 
  rc= rename_table(*getSession(), engine, old_identifier, new_identifier);
 
178
  rc= rename_table(session(), engine, old_identifier, new_identifier);
179
179
  if (rc && ! skip_error)
180
180
    return true;
181
181