mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
merge
configure.in: Auto merged sql/ha_innobase.cc: Auto merged sql/ha_myisam.cc: Auto merged sql/handler.cc: Auto merged sql/handler.h: Auto merged sql/lock.cc: Auto merged sql/mysql_priv.h: Auto merged sql/sql_db.cc: Auto merged sql/sql_delete.cc: Auto merged sql/sql_insert.cc: Auto merged sql/sql_load.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_select.cc: Auto merged sql/sql_table.cc: Auto merged sql/sql_yacc.yy: Auto merged
This commit is contained in:
@ -128,6 +128,7 @@ typedef struct st_thd_trans {
|
||||
void *bdb_tid;
|
||||
void *innobase_tid;
|
||||
void *gemini_tid;
|
||||
bool innodb_active_trans;
|
||||
} THD_TRANS;
|
||||
|
||||
enum enum_tx_isolation { ISO_READ_UNCOMMITTED, ISO_READ_COMMITTED,
|
||||
@ -268,6 +269,7 @@ public:
|
||||
virtual int extra(enum ha_extra_function operation)=0;
|
||||
virtual int reset()=0;
|
||||
virtual int external_lock(THD *thd, int lock_type)=0;
|
||||
virtual void unlock_row() {}
|
||||
virtual int start_stmt(THD *thd) {return 0;}
|
||||
virtual int delete_all_rows();
|
||||
virtual longlong get_auto_increment();
|
||||
|
Reference in New Issue
Block a user