Commit e9215c3f authored by Zardosht Kasheff's avatar Zardosht Kasheff Committed by Yoni Fogel

[t:2811], merge handlerton MVCC changes to main line

git-svn-id: file:///svn/mysql/tokudb-engine/tokudb-engine@23498 c7de825b-a66e-492c-adef-691d508d4ae1
parent b14084bb
This diff is collapsed.
...@@ -211,6 +211,7 @@ class ha_tokudb : public handler { ...@@ -211,6 +211,7 @@ class ha_tokudb : public handler {
// instance of cursor being used for init_xxx and rnd_xxx functions // instance of cursor being used for init_xxx and rnd_xxx functions
// //
DBC *cursor; DBC *cursor;
u_int32_t cursor_flags; // flags for cursor
// //
// flags that are returned in table_flags() // flags that are returned in table_flags()
// //
...@@ -432,6 +433,7 @@ class ha_tokudb : public handler { ...@@ -432,6 +433,7 @@ class ha_tokudb : public handler {
ha_rows records_in_range(uint inx, key_range * min_key, key_range * max_key); ha_rows records_in_range(uint inx, key_range * min_key, key_range * max_key);
u_int32_t get_cursor_isolation_flags(enum thr_lock_type lock_type, THD* thd);
THR_LOCK_DATA **store_lock(THD * thd, THR_LOCK_DATA ** to, enum thr_lock_type lock_type); THR_LOCK_DATA **store_lock(THD * thd, THR_LOCK_DATA ** to, enum thr_lock_type lock_type);
int get_status(); int get_status();
......
...@@ -81,6 +81,7 @@ typedef enum { ...@@ -81,6 +81,7 @@ typedef enum {
hatoku_iso_not_set = 0, hatoku_iso_not_set = 0,
hatoku_iso_read_uncommitted, hatoku_iso_read_uncommitted,
hatoku_iso_read_committed, hatoku_iso_read_committed,
hatoku_iso_repeatable_read,
hatoku_iso_serializable hatoku_iso_serializable
} HA_TOKU_ISO_LEVEL; } HA_TOKU_ISO_LEVEL;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment