← Back to branch summary

~vkolesnikov/pbxt/pbxt-preload-test-bug

« back to all changes in this revision

Viewing changes to src/xt_defs.h

  • Committer: Paul McCullagh
  • Date: 2010-09-10 14:46:31 UTC
  • Revision ID: paul.mccullagh@primebase.org-20100910144631-cmctxqghnpz4iyqh
Changes from merge with MariaDB

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/xt_defs.h
891
891
#define MX_ULONGLONG_T                                          ulonglong
892
892
#define MX_LONGLONG_T                                           longlong
893
893
#define MX_CHARSET_INFO                                         CHARSET_INFO
894
 
#define MX_CONST_CHARSET_INFO                           struct charset_info_st                  
 
894
#ifdef MARIADB_BASE_VERSION
 
895
#define MX_CONST_CHARSET_INFO                           const struct charset_info_st
 
896
#else
 
897
#define MX_CONST_CHARSET_INFO                           struct charset_info_st
 
898
#endif                  
895
899
#define MX_CONST                                                        
896
900
#define MX_BITMAP                                                       MY_BITMAP
897
901
#define MX_BIT_SIZE()                                           n_bits