Rename WT_DEADLOCK to WT_ROLLBACK, reference #1204.

2014-10-17 07:46:30 -04:00
parent b063e91fb4
commit 7590319f16
19 changed files with 79 additions and 58 deletions
--- a/examples/java/com/wiredtiger/examples/ex_all.java
+++ b/examples/java/com/wiredtiger/examples/ex_all.java
@@ -666,7 +666,7 @@ transaction_ops(Connection conn, Session session)
         * If commit_transaction fails, the transaction was rolled-back.
         */
        break;
-    case wiredtiger.WT_DEADLOCK:            /* Update conflict */
+    case wiredtiger.WT_ROLLBACK:            /* Update conflict */
    default:                /* Other error */
        ret = session.rollback_transaction(null);
        /* The rollback_transaction call resets all open cursors. */