From 132409840c52125fc05b912ba30149dfbbe256f0 Mon Sep 17 00:00:00 2001
From: Zardosht Kasheff <zardosht@tokutek.com>
Date: Wed, 17 Apr 2013 00:00:42 -0400
Subject: [PATCH] [t:4876], small change to toku_txn_begin relating to input
 flags

git-svn-id: file:///svn/toku/tokudb@44110 c7de825b-a66e-492c-adef-691d508d4ae1
---
 src/ydb_txn.c | 65 ++++++++++++++++++++++++---------------------------
 1 file changed, 31 insertions(+), 34 deletions(-)

diff --git a/src/ydb_txn.c b/src/ydb_txn.c
index 6d03a1e82d1..50a4f53aebe 100644
--- a/src/ydb_txn.c
+++ b/src/ydb_txn.c
@@ -374,40 +374,37 @@ toku_txn_begin(DB_ENV *env, DB_TXN * stxn, DB_TXN ** txn, u_int32_t flags) {
     }
     flags &= ~iso_flags;
 
-    if (stxn) {
-        child_isolation = db_txn_struct_i(stxn)->iso;
-    }
-    else {
-        switch (iso_flags) {
-            case (DB_INHERIT_ISOLATION):
-                if (stxn) {
-                    child_isolation = db_txn_struct_i(stxn)->iso;
-                }
-                else {
-                    return toku_ydb_do_error(
-                        env, 
-                        EINVAL, 
-                        "Cannot set DB_INHERIT_ISOLATION when no parent exists\n"
-                        );                    
-                }
-                break;
-            case (DB_READ_COMMITTED):
-                child_isolation = TOKU_ISO_READ_COMMITTED;
-                break;
-            case (DB_READ_UNCOMMITTED):
-                child_isolation = TOKU_ISO_READ_UNCOMMITTED;
-                break;
-            case (DB_TXN_SNAPSHOT):
-                child_isolation = TOKU_ISO_SNAPSHOT;
-                break;
-            case (DB_SERIALIZABLE):
-            case (0):
-                child_isolation = TOKU_ISO_SERIALIZABLE;
-                break;
-            default:
-                assert(FALSE); // error path is above, so this should not happen
-                break;
-        }
+    switch (iso_flags) {
+        case (DB_INHERIT_ISOLATION):
+            if (stxn) {
+                child_isolation = db_txn_struct_i(stxn)->iso;
+            }
+            else {
+                return toku_ydb_do_error(
+                    env, 
+                    EINVAL, 
+                    "Cannot set DB_INHERIT_ISOLATION when no parent exists\n"
+                    );                    
+            }
+            break;
+        case (DB_READ_COMMITTED):
+            child_isolation = TOKU_ISO_READ_COMMITTED;
+            break;
+        case (DB_READ_UNCOMMITTED):
+            child_isolation = TOKU_ISO_READ_UNCOMMITTED;
+            break;
+        case (DB_TXN_SNAPSHOT):
+            child_isolation = TOKU_ISO_SNAPSHOT;
+            break;
+        case (DB_SERIALIZABLE):
+            child_isolation = TOKU_ISO_SERIALIZABLE;
+            break;
+        case (0):
+            child_isolation = stxn ? db_txn_struct_i(stxn)->iso : TOKU_ISO_SERIALIZABLE;
+            break;
+        default:
+            assert(FALSE); // error path is above, so this should not happen
+            break;
     }
     if (stxn && child_isolation != db_txn_struct_i(stxn)->iso) {
         return toku_ydb_do_error(