diff --git a/lib/Doctrine/DBAL/Connection.php b/lib/Doctrine/DBAL/Connection.php
index 7aaca52b3..d4dab2ff9 100644
--- a/lib/Doctrine/DBAL/Connection.php
+++ b/lib/Doctrine/DBAL/Connection.php
@@ -683,10 +683,7 @@ class Connection
     }
 
     /**
-     * Start a transaction or set a savepoint.
-     *
-     * if trying to set a savepoint and there is no active transaction
-     * a new transaction is being started.
+     * Start a transaction by suspending auto-commit mode.
      *
      * @return void
      */
@@ -702,12 +699,11 @@ class Connection
     }
 
     /**
-     * Commits the database changes done during a transaction that is in
-     * progress or release a savepoint. This function may only be called when
-     * auto-committing is disabled, otherwise it will fail.
+     * Commits the current transaction.
      *
      * @return void
-     * @throws ConnectionException If the commit failed.
+     * @throws ConnectionException If the commit failed due to no active transaction or
+     *                             because the transaction was marked for rollback only.
      */
     public function commit()
     {
@@ -736,7 +732,6 @@ class Connection
      * this method can be listened with onPreTransactionRollback and onTransactionRollback
      * eventlistener methods
      *
-     * @param string $savepoint                 Name of a savepoint to rollback to.
      * @throws ConnectionException   If the rollback operation fails at database level.
      */
     public function rollback()
@@ -752,6 +747,7 @@ class Connection
             $this->_conn->rollback();
             $this->_isRollbackOnly = false;
         } else {
+            $this->_isRollbackOnly = true;
             --$this->_transactionNestingLevel;
         }
     }
diff --git a/lib/Doctrine/ORM/Mapping/ClassMetadata.php b/lib/Doctrine/ORM/Mapping/ClassMetadata.php
index 62eb079d5..a46a0d33d 100644
--- a/lib/Doctrine/ORM/Mapping/ClassMetadata.php
+++ b/lib/Doctrine/ORM/Mapping/ClassMetadata.php
@@ -341,7 +341,7 @@ final class ClassMetadata extends ClassMetadataInfo
     }
     
     /**
-     * Restores some state that could not be serialized/unserialized.
+     * Restores some state that can not be serialized/unserialized.
      * 
      * @return void
      */
diff --git a/tests/Doctrine/Tests/DBAL/Functional/AllTests.php b/tests/Doctrine/Tests/DBAL/Functional/AllTests.php
index de753a40a..f114e8c0b 100644
--- a/tests/Doctrine/Tests/DBAL/Functional/AllTests.php
+++ b/tests/Doctrine/Tests/DBAL/Functional/AllTests.php
@@ -24,6 +24,7 @@ class AllTests
         $suite->addTestSuite('Doctrine\Tests\DBAL\Functional\Schema\SqliteSchemaManagerTest');
         $suite->addTestSuite('Doctrine\Tests\DBAL\Functional\Schema\MySqlSchemaManagerTest');
         $suite->addTestSuite('Doctrine\Tests\DBAL\Functional\Schema\PostgreSqlSchemaManagerTest');
+        $suite->addTestSuite('Doctrine\Tests\DBAL\Functional\ConnectionTest');
 
         return $suite;
     }
diff --git a/tests/Doctrine/Tests/DBAL/Functional/ConnectionTest.php b/tests/Doctrine/Tests/DBAL/Functional/ConnectionTest.php
new file mode 100644
index 000000000..8ed7a57d4
--- /dev/null
+++ b/tests/Doctrine/Tests/DBAL/Functional/ConnectionTest.php
@@ -0,0 +1,64 @@
+<?php
+
+namespace Doctrine\Tests\DBAL\Functional;
+
+use Doctrine\DBAL\ConnectionException;
+
+require_once __DIR__ . '/../../TestInit.php';
+
+class ConnectionTest extends \Doctrine\Tests\DbalFunctionalTestCase
+{
+    
+    public function testTransactionNestingBehavior()
+    {
+        try {
+            $this->_conn->beginTransaction();
+            $this->assertEquals(1, $this->_conn->getTransactionNestingLevel());
+            
+            try {
+                $this->_conn->beginTransaction();
+                $this->assertEquals(2, $this->_conn->getTransactionNestingLevel());
+                throw new \Exception;
+                $this->_conn->commit(); // never reached
+            } catch (\Exception $e) {
+                $this->_conn->rollback();
+                $this->assertEquals(1, $this->_conn->getTransactionNestingLevel());
+                //no rethrow                
+            }
+            $this->assertTrue($this->_conn->getRollbackOnly());
+              
+            $this->_conn->commit(); // should throw exception
+            $this->fail('Transaction commit after failed nested transaction should fail.');
+        } catch (ConnectionException $e) {
+            $this->assertEquals(1, $this->_conn->getTransactionNestingLevel());
+            $this->_conn->rollback();
+            $this->assertEquals(0, $this->_conn->getTransactionNestingLevel());
+        }
+    }
+    
+    public function testTransactionBehavior()
+    {
+        try {
+            $this->_conn->beginTransaction();
+            $this->assertEquals(1, $this->_conn->getTransactionNestingLevel());
+            
+            throw new \Exception;
+              
+            $this->_conn->commit(); // never reached
+        } catch (\Exception $e) {
+            $this->assertEquals(1, $this->_conn->getTransactionNestingLevel());
+            $this->_conn->rollback();
+            $this->assertEquals(0, $this->_conn->getTransactionNestingLevel());
+        }
+        
+        try {
+            $this->_conn->beginTransaction();
+            $this->assertEquals(1, $this->_conn->getTransactionNestingLevel());
+            $this->_conn->commit();
+        } catch (\Exception $e) {
+            $this->_conn->rollback();
+            $this->assertEquals(0, $this->_conn->getTransactionNestingLevel());
+        }
+    }
+    
+}
\ No newline at end of file
diff --git a/tools/sandbox/Entities/User.php b/tools/sandbox/Entities/User.php
index cf44b4683..95487f570 100644
--- a/tools/sandbox/Entities/User.php
+++ b/tools/sandbox/Entities/User.php
@@ -2,7 +2,7 @@
 
 namespace Entities;
 
-/** @Entity @Table(name="users", indexes={@Index(name="name_idx", columns={"name", "test"})}) */
+/** @Entity @Table(name="users") */
 class User {
     /**
      * @Id @Column(type="integer")
@@ -11,8 +11,6 @@ class User {
     private $id;
     /** @Column(type="string", length=50) */
     private $name;
-    /** @Column(type="string", length=50) */
-    private $test;
     /**
      * @OneToOne(targetEntity="Address")
      * @JoinColumn(name="address_id", referencedColumnName="id")