← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

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

Fix pidfile argument.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/pbxt/src/xt_defs.h
1
 
/* Copyright (C) 2005 PrimeBase Technologies GmbH
 
1
/* Copyright (c) 2005 PrimeBase Technologies GmbH
2
2
 *
3
3
 * PrimeBase XT
4
4
 *
14
14
 *
15
15
 * You should have received a copy of the GNU General Public License
16
16
 * along with this program; if not, write to the Free Software
17
 
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
17
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
18
18
 *
19
19
 * Author: Paul McCullagh
20
20
 *
872
872
#define MYSQL_TYPE_ENUM                                         DRIZZLE_TYPE_ENUM
873
873
#define MYSQL_TYPE_LONG                                         DRIZZLE_TYPE_LONG
874
874
#define MYSQL_PLUGIN_VAR_HEADER                         DRIZZLE_PLUGIN_VAR_HEADER
 
875
#define MYSQL_SYSVAR_STR                                        DRIZZLE_SYSVAR_STR
 
876
#define MYSQL_SYSVAR_INT                                        DRIZZLE_SYSVAR_INT
 
877
#define MYSQL_SYSVAR_BOOL                                       DRIZZLE_SYSVAR_BOOL
 
878
#define MYSQL_SYSVAR                                            DRIZZLE_SYSVAR
875
879
#define MYSQL_STORAGE_ENGINE_PLUGIN                     DRIZZLE_STORAGE_ENGINE_PLUGIN
876
880
#define MYSQL_INFORMATION_SCHEMA_PLUGIN         DRIZZLE_INFORMATION_SCHEMA_PLUGIN
877
881
#define memcpy_fixed                                            memcpy
888
892
#define MX_CHARSET_INFO                                         struct drizzled::charset_info_st
889
893
#define MX_CONST_CHARSET_INFO                           const struct drizzled::charset_info_st                  
890
894
#define MX_CONST                                                        const
891
 
#include <boost/dynamic_bitset.hpp>
892
 
#define MX_BITMAP                                                       boost::dynamic_bitset<>
893
 
#define MX_BIT_SIZE()                                           size()
894
 
#define MX_BIT_SET(x, y)                                        (x)->set(y)
895
 
//#define MX_BIT_FAST_TEST_AND_SET(x, y)                (x)->testAndSet(y)
896
 
#define MX_BIT_FAST_TEST_AND_SET(x, y)          (x)->test(y)
 
895
#define MX_BITMAP                                                       drizzled::MyBitmap
 
896
#define MX_BIT_SIZE()                                           numOfBitsInMap()
 
897
#define MX_BIT_SET(x, y)                                        (x)->setBit(y)
 
898
#define MX_BIT_FAST_TEST_AND_SET(x, y)                          (x)->testAndSet(y)
897
899
 
898
900
#define my_bool                                                         bool
899
901
//#define int16                                                         int16_t
927
929
#define thd_mark_transaction_to_rollback        ::drizzled::mark_transaction_to_rollback
928
930
#define thd_ha_data                                                     session_ha_data
929
931
#define current_thd                                                     current_session
930
 
#define thd_sql_command(x)                                              ((x)->getSqlCommand())
 
932
#define thd_sql_command                                         session_sql_command
931
933
#define thd_test_options                                        session_test_options
932
934
#define thd_killed                                                      session_killed
933
 
#define thd_tx_isolation(x)                                     ((x)->getTxIsolation())
 
935
#define thd_tx_isolation                                        session_tx_isolation
934
936
#define thd_in_lock_tables                                      session_in_lock_tables
935
 
#define thd_tablespace_op(x)                                    ((x)->doingTablespaceOperation())
 
937
#define thd_tablespace_op                                       session_tablespace_op
936
938
#define thd_alloc                                                       session_alloc
937
939
#define thd_make_lex_string                                     session_make_lex_string
938
940
#define column_bitmaps_signal()
939
941
 
940
942
#define my_pthread_setspecific_ptr(T, V)        pthread_setspecific(T, (void*) (V))
941
943
 
942
 
/* TODO: This is dangerous! */
943
 
#define mysql_real_data_home                            ::drizzled::getDataHomeCatalog().file_string().c_str()
 
944
#define mysql_real_data_home                            ::drizzled::getDataHomeCatalog().c_str()
944
945
 
945
946
#define mi_int4store(T,A)   { uint32_t def_temp= (uint32_t) (A);\
946
947
                              ((unsigned char*) (T))[3]= (unsigned char) (def_temp);\
1011
1012
 
1012
1013
#endif // DRIZZLED
1013
1014
 
1014
 
#define MX_BIT_IS_SUBSET(x, y)                          x->is_subset_of(y)
 
1015
#define MX_BIT_IS_SUBSET(x, y)                          bitmap_is_subset(x, y)
1015
1016
 
1016
1017
#ifndef XT_SCAN_CORE_DEFINED
1017
1018
#define XT_SCAN_CORE_DEFINED