← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/pbxt/src/xt_defs.h

Merge Paul

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/pbxt/src/xt_defs.h
887
887
#define thd_charset                                                     session_charset
888
888
#define thd_slave_thread                                        session_slave_thread
889
889
#define thd_binlog_format                                       session_binlog_format
890
 
#define thd_mark_transaction_to_rollback        ::drizzled::session_mark_transaction_to_rollback
 
890
#define thd_mark_transaction_to_rollback        ::drizzled::mark_transaction_to_rollback
891
891
#define thd_ha_data                                                     session_ha_data
892
892
#define current_thd                                                     current_session
893
893
#define thd_sql_command                                         session_sql_command
942
942
#define MX_ULONG_T                                                      ulong
943
943
#define MX_ULONGLONG_T                                          ulonglong
944
944
#define MX_LONGLONG_T                                           longlong
945
 
#define MX_CHARSET_INFO                                         CHARSET_INFO
 
945
#define MX_CHARSET_INFO                                         struct charset_info_st
946
946
#define MX_CONST_CHARSET_INFO                           struct charset_info_st                  
947
947
#define MX_CONST                                                        
948
948
#define MX_BITMAP                                                       MY_BITMAP