← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_table.cc

Merge Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_table.cc
15
15
 
16
16
/* drop and alter of tables */
17
17
 
18
 
#include <drizzled/server_includes.h>
 
18
#include "config.h"
19
19
#include <plugin/myisam/myisam.h>
20
20
#include <drizzled/show.h>
21
21
#include <drizzled/error.h>
26
26
#include <drizzled/sql_lex.h>
27
27
#include <drizzled/session.h>
28
28
#include <drizzled/sql_base.h>
 
29
#include "drizzled/strfunc.h"
29
30
#include <drizzled/db.h>
30
31
#include <drizzled/lock.h>
31
32
#include <drizzled/unireg.h>
35
36
#include <drizzled/table_proto.h>
36
37
#include <drizzled/plugin/client.h>
37
38
#include <drizzled/table_identifier.h>
 
39
#include "mystrings/m_string.h"
 
40
#include "drizzled/global_charset_info.h"
 
41
 
38
42
 
39
43
#include "drizzled/statement/alter_table.h"
40
44
#include "drizzled/plugin/info_schema_table.h"
 
45
#include "drizzled/sql_table.h"
 
46
#include "drizzled/pthread_globals.h"
41
47
 
42
48
#include <algorithm>
 
49
#include <sstream>
43
50
 
44
51
using namespace std;
45
52
using namespace drizzled;
46
53
 
 
54
extern pid_t current_pid;
 
55
 
47
56
static const char hexchars[]= "0123456789abcdef";
48
57
bool is_primary_key(KEY *key_info)
49
58
{