← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/statement/create_index.cc

  • Committer: Jay Pipes
  • Date: 2010-03-09 20:02:29 UTC
  • mto: This revision was merged to the branch mainline in revision 1339.
  • Revision ID: jpipes@serialcoder-20100309200229-dfrliy4fads9vyf4
https://launchpad.net/bugs/535296
Fixes Bug #535296 by only incrementing ha_commit_count when its a normal transaction commit.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/statement/create_index.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, Inc.
 
4
 *  Copyright (C) 2009 Sun Microsystems
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
18
18
 *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
19
19
 */
20
20
 
21
 
#include <config.h>
22
 
 
23
 
#include <drizzled/show.h>
24
 
#include <drizzled/session.h>
25
 
#include <drizzled/statement/create_index.h>
26
 
#include <drizzled/statement/alter_table.h>
27
 
#include <drizzled/plugin/storage_engine.h>
 
21
#include "config.h"
 
22
#include "drizzled/show.h"
 
23
#include "drizzled/session.h"
 
24
#include "drizzled/statement/create_index.h"
 
25
#include "drizzled/statement/alter_table.h"
 
26
#include "drizzled/db.h"
28
27
 
29
28
namespace drizzled
30
29
{
31
30
 
32
 
namespace statement
33
 
{
34
 
 
35
 
CreateIndex::CreateIndex(Session *in_session, const drizzled::ha_build_method method_arg) :
36
 
  CreateTable(in_session)
37
 
  {
38
 
    getSession()->getLex()->sql_command= SQLCOM_CREATE_INDEX;
39
 
    alter_info.flags.set(ALTER_ADD_INDEX);
40
 
    alter_info.build_method= method_arg;
41
 
    getSession()->getLex()->col_list.clear();
42
 
  }
43
 
 
44
31
bool statement::CreateIndex::execute()
45
32
{
46
 
  TableList *first_table= (TableList *) getSession()->getLex()->select_lex.table_list.first;
47
 
  TableList *all_tables= getSession()->getLex()->query_tables;
48
 
 
49
 
  /* Chicken/Egg... we need to search for the table, to know if the table exists, so we can build a full identifier from it */
50
 
  message::table::shared_ptr original_table_message;
51
 
  {
52
 
    identifier::Table identifier(first_table->getSchemaName(), first_table->getTableName());
53
 
    if (not (original_table_message= plugin::StorageEngine::getTableMessage(*getSession(), identifier)))
54
 
    {
55
 
      my_error(ER_BAD_TABLE_ERROR, identifier);
56
 
      return true;
57
 
    }
58
 
  }
59
 
 
 
33
  TableList *first_table= (TableList *) session->lex->select_lex.table_list.first;
 
34
  TableList *all_tables= session->lex->query_tables;
60
35
  /*
61
36
    CREATE INDEX and DROP INDEX are implemented by calling ALTER
62
37
    TABLE with proper arguments.
67
42
  */
68
43
 
69
44
  assert(first_table == all_tables && first_table != 0);
70
 
  if (getSession()->inTransaction())
 
45
  if (! session->endActiveTransaction())
71
46
  {
72
 
    my_error(ER_TRANSACTIONAL_DDL_NOT_SUPPORTED, MYF(0));
73
47
    return true;
74
48
  }
75
49
 
76
 
  bool res;
77
 
  if (original_table_message->type() == message::Table::STANDARD )
78
 
  {
79
 
    identifier::Table identifier(first_table->getSchemaName(), first_table->getTableName());
80
 
    create_info().default_table_charset= plugin::StorageEngine::getSchemaCollation(identifier);
81
 
 
82
 
    res= alter_table(getSession(), 
83
 
                     identifier,
84
 
                     identifier,
85
 
                     &create_info(), 
86
 
                     *original_table_message,
87
 
                     createTableMessage(), 
88
 
                     first_table,
89
 
                     &alter_info,
90
 
                     0, (Order*) 0, 0);
91
 
  }
92
 
  else
93
 
  {
94
 
    identifier::Table catch22(first_table->getSchemaName(), first_table->getTableName());
95
 
    Table *table= getSession()->find_temporary_table(catch22);
96
 
    assert(table);
97
 
    {
98
 
      identifier::Table identifier(first_table->getSchemaName(), first_table->getTableName(), table->getMutableShare()->getPath());
99
 
      create_info().default_table_charset= plugin::StorageEngine::getSchemaCollation(identifier);
100
 
 
101
 
      res= alter_table(getSession(), 
102
 
                       identifier,
103
 
                       identifier,
104
 
                       &create_info(), 
105
 
                       *original_table_message,
106
 
                       createTableMessage(), 
107
 
                       first_table,
108
 
                       &alter_info,
109
 
                       0, (Order*) 0, 0);
110
 
    }
111
 
  }
112
 
 
 
50
  create_info.row_type= ROW_TYPE_NOT_USED;
 
51
  create_info.default_table_charset= plugin::StorageEngine::getSchemaCollation(session->db.c_str());
 
52
 
 
53
  bool res= alter_table(session, 
 
54
                        first_table->db, 
 
55
                        first_table->table_name,
 
56
                        &create_info, 
 
57
                        create_table_proto, 
 
58
                        first_table,
 
59
                        &alter_info,
 
60
                        0, (order_st*) 0, 0);
113
61
  return res;
114
62
}
115
63
 
116
 
} /* namespace statement */
117
64
} /* namespace drizzled */