← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/set_var.cc

Merge Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/set_var.cc
44
44
*/
45
45
 
46
46
#include "config.h"
47
 
#include <mysys/my_getopt.h>
 
47
#include "drizzled/my_getopt.h"
48
48
#include <plugin/myisam/myisam.h>
49
49
#include <drizzled/error.h>
50
50
#include <drizzled/gettext.h>
60
60
#include <drizzled/plugin.h>
61
61
#include "drizzled/version.h"
62
62
#include "drizzled/strfunc.h"
63
 
#include "mystrings/m_string.h"
 
63
#include "drizzled/internal/m_string.h"
64
64
#include "drizzled/pthread_globals.h"
 
65
#include "drizzled/charset.h"
65
66
 
66
67
#include <map>
67
68
#include <algorithm>
81
82
static SystemVariableMap system_variable_map;
82
83
extern char *opt_drizzle_tmpdir;
83
84
 
 
85
extern TYPELIB tx_isolation_typelib;
 
86
 
84
87
const char *bool_type_names[]= { "OFF", "ON", NULL };
85
88
TYPELIB bool_typelib=
86
89
{