← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/statement/drop_index.cc

  • Committer: Lee Bieber
  • Date: 2011-03-18 04:10:25 UTC
  • mfrom: (2241.1.2 build)
  • Revision ID: kalebral@gmail.com-20110318041025-1xoj1azy6zobhnbm
Merge Stewart - refactoring of default values
Merge Olaf - more refactoring

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/statement/drop_index.cc
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/drop_index.h"
26
 
#include "drizzled/statement/alter_table.h"
27
 
#include "drizzled/db.h"
28
 
#include "drizzled/plugin/storage_engine.h"
29
 
 
30
 
namespace drizzled
31
 
{
 
21
#include <config.h>
 
22
 
 
23
#include <drizzled/show.h>
 
24
#include <drizzled/session.h>
 
25
#include <drizzled/statement/drop_index.h>
 
26
#include <drizzled/statement/alter_table.h>
 
27
#include <drizzled/plugin/storage_engine.h>
 
28
 
 
29
namespace drizzled {
32
30
 
33
31
bool statement::DropIndex::execute()
34
32
{
35
 
  TableList *first_table= (TableList *) getSession()->lex->select_lex.table_list.first;
36
 
  TableList *all_tables= getSession()->lex->query_tables;
 
33
  TableList *first_table= (TableList *) lex().select_lex.table_list.first;
 
34
  TableList *all_tables= lex().query_tables;
37
35
 
38
36
  /* Chicken/Egg... we need to search for the table, to know if the table exists, so we can build a full identifier from it */
39
37
  message::table::shared_ptr original_table_message;
40
38
  {
41
39
    identifier::Table identifier(first_table->getSchemaName(), first_table->getTableName());
42
 
    if (plugin::StorageEngine::getTableDefinition(*getSession(), identifier, original_table_message) != EEXIST)
 
40
    if (not (original_table_message= plugin::StorageEngine::getTableMessage(session(), identifier)))
43
41
    {
44
42
      my_error(ER_BAD_TABLE_ERROR, identifier);
45
43
      return true;
58
56
  HA_CREATE_INFO create_info;
59
57
 
60
58
  assert(first_table == all_tables && first_table != 0);
61
 
  if (getSession()->inTransaction())
 
59
  if (session().inTransaction())
62
60
  {
63
61
    my_error(ER_TRANSACTIONAL_DDL_NOT_SUPPORTED, MYF(0));
64
62
    return true;
73
71
 
74
72
    create_info.default_table_charset= plugin::StorageEngine::getSchemaCollation(identifier);
75
73
 
76
 
    res= alter_table(getSession(), 
 
74
    res= alter_table(&session(), 
77
75
                     identifier,
78
76
                     identifier,
79
77
                     &create_info, 
86
84
  else
87
85
  {
88
86
    identifier::Table catch22(first_table->getSchemaName(), first_table->getTableName());
89
 
    Table *table= getSession()->find_temporary_table(catch22);
 
87
    Table *table= session().find_temporary_table(catch22);
90
88
    assert(table);
91
89
    {
92
90
      identifier::Table identifier(first_table->getSchemaName(), first_table->getTableName(), table->getShare()->getPath());
93
91
      create_info.default_table_charset= plugin::StorageEngine::getSchemaCollation(identifier);
94
92
 
95
 
      res= alter_table(getSession(), 
 
93
      res= alter_table(&session(), 
96
94
                       identifier,
97
95
                       identifier,
98
96
                       &create_info,