← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/ha_commands.cc

Merge Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/ha_commands.cc
24
24
*/
25
25
 
26
26
#include "config.h"
27
 
#include "mysys/hash.h"
 
27
#include "drizzled/my_hash.h"
28
28
#include "drizzled/error.h"
29
29
#include "drizzled/gettext.h"
30
30
#include "drizzled/probes.h"
40
40
#include "drizzled/field/timestamp.h"
41
41
#include "drizzled/message/table.pb.h"
42
42
#include "drizzled/plugin/client.h"
 
43
#include "drizzled/internal/my_sys.h"
43
44
 
44
45
using namespace std;
45
46
using namespace drizzled;
57
58
  "", "FIXED", "DYNAMIC", "COMPRESSED", "REDUNDANT", "COMPACT", "PAGE", "?","?","?"
58
59
};
59
60
 
60
 
const char *tx_isolation_names[] =
61
 
{ "READ-UNCOMMITTED", "READ-COMMITTED", "REPEATABLE-READ", "SERIALIZABLE",
62
 
  NULL};
63
 
 
64
 
TYPELIB tx_isolation_typelib= {array_elements(tx_isolation_names)-1,"",
65
 
                               tx_isolation_names, NULL};
66
61
 
67
62
 
68
63
/**