← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sys_var.cc

Merge trunk and resolve conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sys_var.cc
38
38
 
39
39
*/
40
40
 
41
 
#include "config.h"
42
 
#include "drizzled/option.h"
43
 
#include "drizzled/error.h"
44
 
#include "drizzled/gettext.h"
45
 
#include "drizzled/tztime.h"
46
 
#include "drizzled/data_home.h"
47
 
#include "drizzled/set_var.h"
48
 
#include "drizzled/session.h"
49
 
#include "drizzled/sql_base.h"
50
 
#include "drizzled/lock.h"
51
 
#include "drizzled/item/uint.h"
52
 
#include "drizzled/item/null.h"
53
 
#include "drizzled/item/float.h"
54
 
#include "drizzled/item/string.h"
55
 
#include "drizzled/plugin.h"
56
 
#include "drizzled/version.h"
57
 
#include "drizzled/strfunc.h"
58
 
#include "drizzled/internal/m_string.h"
59
 
#include "drizzled/pthread_globals.h"
60
 
#include "drizzled/charset.h"
61
 
#include "drizzled/transaction_services.h"
62
 
#include "drizzled/constrained_value.h"
63
 
#include "drizzled/visibility.h"
64
 
#include "drizzled/typelib.h"
65
 
#include "drizzled/plugin/storage_engine.h"
 
41
#include <config.h>
 
42
#include <drizzled/option.h>
 
43
#include <drizzled/error.h>
 
44
#include <drizzled/gettext.h>
 
45
#include <drizzled/tztime.h>
 
46
#include <drizzled/data_home.h>
 
47
#include <drizzled/set_var.h>
 
48
#include <drizzled/session.h>
 
49
#include <drizzled/sql_base.h>
 
50
#include <drizzled/lock.h>
 
51
#include <drizzled/item/uint.h>
 
52
#include <drizzled/item/null.h>
 
53
#include <drizzled/item/float.h>
 
54
#include <drizzled/item/string.h>
 
55
#include <drizzled/plugin.h>
 
56
#include <drizzled/version.h>
 
57
#include <drizzled/strfunc.h>
 
58
#include <drizzled/internal/m_string.h>
 
59
#include <drizzled/pthread_globals.h>
 
60
#include <drizzled/charset.h>
 
61
#include <drizzled/transaction_services.h>
 
62
#include <drizzled/constrained_value.h>
 
63
#include <drizzled/visibility.h>
 
64
#include <drizzled/typelib.h>
 
65
#include <drizzled/plugin/storage_engine.h>
66
66
 
67
67
#include <cstdio>
68
68
#include <map>