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

[t:2494], merge handlerton portion to main

git-svn-id: file:///svn/mysql/tokudb-engine/tokudb-engine@19074 c7de825b-a66e-492c-adef-691d508d4ae1
parent 7f6651a8
...@@ -579,6 +579,9 @@ inline HA_TOKU_ISO_LEVEL tx_to_toku_iso(ulong tx_isolation) { ...@@ -579,6 +579,9 @@ inline HA_TOKU_ISO_LEVEL tx_to_toku_iso(ulong tx_isolation) {
if (tx_isolation == ISO_READ_UNCOMMITTED) { if (tx_isolation == ISO_READ_UNCOMMITTED) {
return hatoku_iso_read_uncommitted; return hatoku_iso_read_uncommitted;
} }
else if (tx_isolation == ISO_READ_COMMITTED) {
return hatoku_iso_read_committed;
}
else { else {
return hatoku_iso_serializable; return hatoku_iso_serializable;
} }
...@@ -588,6 +591,9 @@ inline u_int32_t toku_iso_to_txn_flag (HA_TOKU_ISO_LEVEL lvl) { ...@@ -588,6 +591,9 @@ inline u_int32_t toku_iso_to_txn_flag (HA_TOKU_ISO_LEVEL lvl) {
if (lvl == hatoku_iso_read_uncommitted) { if (lvl == hatoku_iso_read_uncommitted) {
return DB_READ_UNCOMMITTED; return DB_READ_UNCOMMITTED;
} }
else if (lvl == hatoku_iso_read_committed) {
return DB_READ_COMMITTED;
}
else { else {
return 0; return 0;
} }
......
...@@ -79,6 +79,7 @@ inline unsigned int my_tid() { ...@@ -79,6 +79,7 @@ inline unsigned int my_tid() {
typedef enum { 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_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