← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/statement/truncate.cc

  • Committer: Monty Taylor
  • Date: 2011-01-12 21:31:39 UTC
  • mto: (2081.1.1 drizzle)
  • mto: This revision was merged to the branch mainline in revision 2082.
  • Revision ID: mordred@inaugust.com-20110112213139-65ivcqxyydejcvr3
Removed some redundant declarations.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/statement/truncate.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 "config.h"
22
22
#include <drizzled/show.h>
23
23
#include <drizzled/session.h>
24
24
#include <drizzled/statement/truncate.h>
28
28
 
29
29
bool statement::Truncate::execute()
30
30
{
31
 
  TableList *first_table= (TableList *) getSession()->getLex()->select_lex.table_list.first;
32
 
 
33
 
  if (getSession()->inTransaction())
34
 
  {
35
 
    my_error(ER_TRANSACTIONAL_DDL_NOT_SUPPORTED, MYF(0));
36
 
    return true;
37
 
  }
38
 
 
39
 
  return truncate(*getSession(), first_table);
 
31
  TableList *first_table= (TableList *) session->lex->select_lex.table_list.first;
 
32
  if (! session->endActiveTransaction())
 
33
  {
 
34
    return true;
 
35
  }
 
36
  /*
 
37
   * Don't allow this within a transaction because we want to use
 
38
   * re-generate table
 
39
   */
 
40
  if (session->inTransaction())
 
41
  {
 
42
    my_message(ER_LOCK_OR_ACTIVE_TRANSACTION, 
 
43
               ER(ER_LOCK_OR_ACTIVE_TRANSACTION), 
 
44
               MYF(0));
 
45
    return true;
 
46
  }
 
47
 
 
48
  return truncate(*session, first_table);
40
49
}
41
50
 
42
51
} /* namespace drizzled */