← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_class.cc

  • Committer: Monty Taylor
  • Date: 2008-10-29 21:21:57 UTC
  • mto: (520.4.26 devel)
  • mto: This revision was merged to the branch mainline in revision 570.
  • Revision ID: monty@inaugust.com-20081029212157-y3127au8tj1jxfal
Moved a bunch of crap out of common_includes.
Killed innodb_plugin_extras.h.
Made kittens happy.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_class.cc
32
32
#include <mysys/thr_alarm.h>
33
33
#include <mysys/mysys_err.h>
34
34
#include <drizzled/error.h>
35
 
#include <drizzled/innodb_plugin_extras.h>
36
35
#include <drizzled/query_id.h>
 
36
#include <drizzled/data_home.h>
37
37
 
38
38
extern scheduler_functions thread_scheduler;
39
39
/*
603
603
  m_internal_handler= NULL;
604
604
}
605
605
 
606
 
extern "C"
 
606
#if defined(__cplusplus)
 
607
extern "C" {
 
608
#endif
 
609
 
607
610
void *session_alloc(Session *session, unsigned int size)
608
611
{
609
612
  return session->alloc(size);
610
613
}
611
614
 
612
 
extern "C"
613
615
void *session_calloc(Session *session, unsigned int size)
614
616
{
615
617
  return session->calloc(size);
616
618
}
617
619
 
618
 
extern "C"
619
620
char *session_strdup(Session *session, const char *str)
620
621
{
621
622
  return session->strdup(str);
622
623
}
623
624
 
624
 
extern "C"
625
625
char *session_strmake(Session *session, const char *str, unsigned int size)
626
626
{
627
627
  return session->strmake(str, size);
628
628
}
629
629
 
630
 
extern "C"
631
 
LEX_STRING *session_make_lex_string(Session *session, LEX_STRING *lex_str,
632
 
                                const char *str, unsigned int size,
633
 
                                int allocate_lex_string)
634
 
{
635
 
  return session->make_lex_string(lex_str, str, size,
636
 
                              (bool) allocate_lex_string);
637
 
}
638
 
 
639
 
extern "C"
640
630
void *session_memdup(Session *session, const void* str, unsigned int size)
641
631
{
642
632
  return session->memdup(str, size);
643
633
}
644
634
 
645
 
extern "C"
646
635
void session_get_xid(const Session *session, DRIZZLE_XID *xid)
647
636
{
648
637
  *xid = *(DRIZZLE_XID *) &session->transaction.xid_state.xid;
649
638
}
650
639
 
 
640
#if defined(__cplusplus)
 
641
}
 
642
#endif
 
643
 
651
644
/*
652
645
  Init common variables that has to be reset on start and on change_user
653
646
*/
2250
2243
}
2251
2244
 
2252
2245
 
2253
 
#ifdef INNODB_COMPATIBILITY_HOOKS
 
2246
extern "C"
 
2247
LEX_STRING *session_make_lex_string(Session *session, LEX_STRING *lex_str,
 
2248
                                const char *str, unsigned int size,
 
2249
                                int allocate_lex_string)
 
2250
{
 
2251
  return session->make_lex_string(lex_str, str, size,
 
2252
                              (bool) allocate_lex_string);
 
2253
}
 
2254
 
2254
2255
extern "C" const struct charset_info_st *session_charset(Session *session)
2255
2256
{
2256
2257
  return(session->charset());
2280
2281
{
2281
2282
  mark_transaction_to_rollback(session, all);
2282
2283
}
2283
 
#endif // INNODB_COMPATIBILITY_HOOKS */
2284
2284
 
2285
2285
 
2286
2286
/**