From 2e361618a3218007435d239998e14fca141cb500 Mon Sep 17 00:00:00 2001
From: Victor Dubiniuk <victor.dubiniuk@gmail.com>
Date: Wed, 25 Feb 2015 23:16:52 +0300
Subject: [PATCH 1/2] Update doctrine/dbal to 2.5.1

---
 3rdparty | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/3rdparty b/3rdparty
index b10ff3608613..b6d348107465 160000
--- a/3rdparty
+++ b/3rdparty
@@ -1 +1 @@
-Subproject commit b10ff36086131c5bddae739bae967bca368f01af
+Subproject commit b6d348107465ff78e36bb530f71f1495b6ed47e1

From 9e38e2c1a9326318f247a0efe95c3ab9b5b3664c Mon Sep 17 00:00:00 2001
From: Victor Dubiniuk <victor.dubiniuk@gmail.com>
Date: Wed, 11 Feb 2015 19:35:46 +0300
Subject: [PATCH 2/2] Skip primary index if the table has one

---
 lib/private/db/mdb2schemareader.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/private/db/mdb2schemareader.php b/lib/private/db/mdb2schemareader.php
index 7dd4168fb6e6..23104b1bc2d7 100644
--- a/lib/private/db/mdb2schemareader.php
+++ b/lib/private/db/mdb2schemareader.php
@@ -293,6 +293,9 @@ private function loadIndex($table, $xml) {
 		}
 		if (!empty($fields)) {
 			if (isset($primary) && $primary) {
+				if ($table->hasPrimaryKey()) {
+					return;
+				}
 				$table->setPrimaryKey($fields, $name);
 			} else {
 				if (isset($unique) && $unique) {