~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/statement/create_index.cc

  • Committer: Brian Aker
  • Date: 2009-12-03 01:17:53 UTC
  • mto: (1237.3.2 push)
  • mto: This revision was merged to the branch mainline in revision 1238.
  • Revision ID: brian@gaz-20091203011753-159h2no5m5c5dt9b
Small cleanups, did in MERGE table only engine flag.

Show diffs side-by-side

added added

removed removed

Lines of Context:
18
18
 *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
19
19
 */
20
20
 
21
 
#include "config.h"
 
21
#include "drizzled/server_includes.h"
22
22
#include "drizzled/show.h"
23
23
#include "drizzled/session.h"
24
24
#include "drizzled/statement/create_index.h"
25
25
#include "drizzled/statement/alter_table.h"
26
 
#include "drizzled/db.h"
27
26
 
28
27
namespace drizzled
29
28
{
32
31
{
33
32
  TableList *first_table= (TableList *) session->lex->select_lex.table_list.first;
34
33
  TableList *all_tables= session->lex->query_tables;
35
 
 
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 */
37
 
  message::Table original_table_message;
38
 
  {
39
 
    TableIdentifier identifier(first_table->db, first_table->table_name);
40
 
    if (plugin::StorageEngine::getTableDefinition(*session, identifier, original_table_message) != EEXIST)
41
 
    {
42
 
      my_error(ER_BAD_TABLE_ERROR, MYF(0), identifier.getSQLPath().c_str());
43
 
      return true;
44
 
    }
45
 
  }
46
 
 
47
34
  /*
48
35
    CREATE INDEX and DROP INDEX are implemented by calling ALTER
49
36
    TABLE with proper arguments.
60
47
  }
61
48
 
62
49
  create_info.row_type= ROW_TYPE_NOT_USED;
63
 
 
64
 
  bool res;
65
 
  if (original_table_message.type() == message::Table::STANDARD )
66
 
  {
67
 
    TableIdentifier identifier(first_table->db, first_table->table_name);
68
 
    create_info.default_table_charset= plugin::StorageEngine::getSchemaCollation(identifier);
69
 
 
70
 
    res= alter_table(session, 
71
 
                     identifier,
72
 
                     identifier,
73
 
                     &create_info, 
74
 
                     create_table_message, 
75
 
                     first_table,
76
 
                     &alter_info,
77
 
                     0, (order_st*) 0, 0);
78
 
  }
79
 
  else
80
 
  {
81
 
    Table *table= session->find_temporary_table(first_table);
82
 
    assert(table);
83
 
    {
84
 
      TableIdentifier identifier(first_table->db, first_table->table_name, table->s->path.str);
85
 
      create_info.default_table_charset= plugin::StorageEngine::getSchemaCollation(identifier);
86
 
 
87
 
      res= alter_table(session, 
88
 
                       identifier,
89
 
                       identifier,
90
 
                       &create_info, 
91
 
                       create_table_message, 
92
 
                       first_table,
93
 
                       &alter_info,
94
 
                       0, (order_st*) 0, 0);
95
 
    }
96
 
  }
 
50
  create_info.default_table_charset= get_default_db_collation(session->db.c_str());
 
51
 
 
52
  bool res= alter_table(session, 
 
53
                        first_table->db, 
 
54
                        first_table->table_name,
 
55
                        &create_info, 
 
56
                        &create_table_proto, 
 
57
                        first_table,
 
58
                        &alter_info,
 
59
                        0, (order_st*) 0, 0);
97
60
  return res;
98
61
}
99
62