← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/myisam/ha_myisam.cc

  • Committer: Mark Atwood
  • Date: 2011-08-11 03:05:03 UTC
  • mfrom: (2385.1.12 refactor4)
  • Revision ID: me@mark.atwood.name-20110811030503-rp9xjihc5x3y0x4q
merge lp:~olafvdspek/drizzle/refactor4

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/myisam/ha_myisam.cc
15
15
 
16
16
 
17
17
 
18
 
#include "config.h"
19
 
#include "drizzled/internal/my_bit.h"
 
18
#include <config.h>
 
19
#include <drizzled/internal/my_bit.h>
20
20
#include "myisampack.h"
21
21
#include "ha_myisam.h"
22
22
#include "myisam_priv.h"
23
 
#include "drizzled/option.h"
24
 
#include "drizzled/internal/my_bit.h"
25
 
#include "drizzled/internal/m_string.h"
26
 
#include "drizzled/util/test.h"
27
 
#include "drizzled/error.h"
28
 
#include "drizzled/errmsg_print.h"
29
 
#include "drizzled/gettext.h"
30
 
#include "drizzled/session.h"
31
 
#include "drizzled/plugin.h"
32
 
#include "drizzled/plugin/client.h"
33
 
#include "drizzled/table.h"
34
 
#include "drizzled/memory/multi_malloc.h"
35
 
#include "drizzled/plugin/daemon.h"
36
 
 
 
23
#include <drizzled/option.h>
 
24
#include <drizzled/internal/my_bit.h>
 
25
#include <drizzled/internal/m_string.h>
 
26
#include <drizzled/util/test.h>
 
27
#include <drizzled/error.h>
 
28
#include <drizzled/errmsg_print.h>
 
29
#include <drizzled/gettext.h>
 
30
#include <drizzled/session.h>
 
31
#include <drizzled/plugin.h>
 
32
#include <drizzled/plugin/client.h>
 
33
#include <drizzled/table.h>
 
34
#include <drizzled/memory/multi_malloc.h>
 
35
#include <drizzled/plugin/daemon.h>
 
36
#include <drizzled/session/table_messages.h>
37
37
#include <drizzled/plugin/storage_engine.h>
 
38
#include <drizzled/key.h>
 
39
#include <drizzled/statistics_variables.h>
 
40
#include <drizzled/system_variables.h>
38
41
 
39
42
#include <boost/algorithm/string.hpp>
40
43
#include <boost/scoped_ptr.hpp>
119
122
  int doCreateTable(Session&,
120
123
                    Table& table_arg,
121
124
                    const identifier::Table &identifier,
122
 
                    message::Table&);
 
125
                    const message::Table&);
123
126
 
124
127
  int doRenameTable(Session&, const identifier::Table &from, const identifier::Table &to);
125
128
 
145
148
 
146
149
  void doGetTableIdentifiers(drizzled::CachedDirectory &directory,
147
150
                             const drizzled::identifier::Schema &schema_identifier,
148
 
                             drizzled::identifier::Table::vector &set_of_identifiers);
 
151
                             drizzled::identifier::table::vector &set_of_identifiers);
149
152
  bool validateCreateTableOption(const std::string &key, const std::string &state)
150
153
  {
151
154
    (void)state;
160
163
 
161
164
void MyisamEngine::doGetTableIdentifiers(drizzled::CachedDirectory&,
162
165
                                         const drizzled::identifier::Schema&,
163
 
                                         drizzled::identifier::Table::vector&)
 
166
                                         drizzled::identifier::table::vector&)
164
167
{
165
168
}
166
169
 
1357
1360
int MyisamEngine::doCreateTable(Session &session,
1358
1361
                                Table& table_arg,
1359
1362
                                const identifier::Table &identifier,
1360
 
                                message::Table& create_proto)
 
1363
                                const message::Table& create_proto)
1361
1364
{
1362
1365
  int error;
1363
1366
  uint32_t create_flags= 0, create_records;