← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/pbms/src/defs_ms.h

Merge Joe, plus I updated the tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/pbms/src/defs_ms.h
1
 
/* Copyright (C) 2008 PrimeBase Technologies GmbH, Germany
 
1
/* Copyright (c) 2008 PrimeBase Technologies GmbH, Germany
2
2
 *
3
3
 * PrimeBase Media Stream for MySQL
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
 * Original author: Paul McCullagh (H&G2JCtL)
20
20
 * Continued development: Barry Leslie
115
115
#define MS_DEFAULT_KEEP_ALIVE           (10) 
116
116
 
117
117
#ifdef DRIZZLED
118
 
#include <boost/dynamic_bitset.hpp>
119
118
/* Drizzle is stuck at this level: */
120
119
#define MYSQL_VERSION_ID                                        60005
121
120
 
132
131
#define MYSQL_THD                                                       Session *
133
132
#define THR_THD                                                         THR_Session
134
133
#define STRUCT_TABLE                                            class Table
135
 
#define MY_BITMAP                                                       boost::dynamic_bitset<>
 
134
#define MY_BITMAP                                                       MyBitmap
136
135
 
137
136
#define MYSQL_TYPE_TIMESTAMP                            DRIZZLE_TYPE_TIMESTAMP
138
137
#define MYSQL_TYPE_LONG                                         DRIZZLE_TYPE_LONG
144
143
#define MYSQL_TYPE_LONG_BLOB                            DRIZZLE_TYPE_BLOB
145
144
#define MYSQL_TYPE_ENUM                                         DRIZZLE_TYPE_ENUM
146
145
#define MYSQL_PLUGIN_VAR_HEADER                         DRIZZLE_PLUGIN_VAR_HEADER
 
146
#define MYSQL_SYSVAR_STR                                        DRIZZLE_SYSVAR_STR
 
147
#define MYSQL_SYSVAR_INT                                        DRIZZLE_SYSVAR_INT
 
148
#define MYSQL_SYSVAR                                            DRIZZLE_SYSVAR
 
149
#define MYSQL_SYSVAR_ULONG                                      DRIZZLE_SYSVAR_ULONG
 
150
#define MYSQL_SYSVAR_ULONGLONG                          DRIZZLE_SYSVAR_ULONGLONG
 
151
#define MYSQL_SYSVAR_BOOL                                       DRIZZLE_SYSVAR_BOOL
147
152
#define MYSQL_STORAGE_ENGINE_PLUGIN                     DRIZZLE_STORAGE_ENGINE_PLUGIN
148
153
#define MYSQL_INFORMATION_SCHEMA_PLUGIN         DRIZZLE_INFORMATION_SCHEMA_PLUGIN
149
154
#define memcpy_fixed                                            memcpy
191
196
#define thd_binlog_format                                       session_binlog_format
192
197
#define thd_mark_transaction_to_rollback        session_mark_transaction_to_rollback
193
198
#define current_thd                                                     current_session
194
 
#define thd_sql_command(x)                                              ((x)->getSqlCommand())
 
199
#define thd_sql_command                                         session_sql_command
195
200
#define thd_test_options                                        session_test_options
196
201
#define thd_killed                                                      session_killed
197
 
#define thd_tx_isolation(x)                                     ((x)->getTxIsolation())
 
202
#define thd_tx_isolation                                        session_tx_isolation
198
203
#define thd_in_lock_tables                                      session_in_lock_tables
199
 
#define thd_tablespace_op(x)                                    ((x)->doingTablespaceOperation())
 
204
#define thd_tablespace_op                                       session_tablespace_op
200
205
#define thd_alloc                                                       session_alloc
201
206
#define thd_make_lex_string                                     session_make_lex_string
202
207