← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

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

  • Committer: Lee Bieber
  • Date: 2011-02-10 21:02:41 UTC
  • mfrom: (2154.1.3 build)
  • Revision ID: kalebral@gmail.com-20110210210241-jouae2uw2pwv6bac
Merge Patrick - 715885: dbqp needs to return non-zero if tests fail
Merge Stewart - 715539: (get|set)_session_proc_info() still exists
Merge Stewart - 715575: misc session_foo() functions exist - should be methods in Session
Merge Stewart - 712843: SAVEPOINT after rollback due to deadlock with autocommit=off in transaction will call startTransaction with an existing transaction where one shouldn't exist

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/pbxt/src/xt_defs.h
927
927
#define thd_mark_transaction_to_rollback        ::drizzled::mark_transaction_to_rollback
928
928
#define thd_ha_data                                                     session_ha_data
929
929
#define current_thd                                                     current_session
930
 
#define thd_sql_command                                         session_sql_command
 
930
#define thd_sql_command(x)                                              ((x)->getSqlCommand())
931
931
#define thd_test_options                                        session_test_options
932
932
#define thd_killed                                                      session_killed
933
 
#define thd_tx_isolation                                        session_tx_isolation
 
933
#define thd_tx_isolation(x)                                     ((x)->getTxIsolation())
934
934
#define thd_in_lock_tables                                      session_in_lock_tables
935
 
#define thd_tablespace_op                                       session_tablespace_op
 
935
#define thd_tablespace_op(x)                                    ((x)->doingTablespaceOperation())
936
936
#define thd_alloc                                                       session_alloc
937
937
#define thd_make_lex_string                                     session_make_lex_string
938
938
#define column_bitmaps_signal()