From 4e9764b1228de91f37bb18ce014e27d125f4e83e Mon Sep 17 00:00:00 2001
From: Victor Dubiniuk <victor.dubiniuk@gmail.com>
Date: Wed, 11 Feb 2015 19:34:48 +0300
Subject: [PATCH 1/2] Submodule update

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

diff --git a/3rdparty b/3rdparty
index 5142d69c5c..59f092231c 160000
--- a/3rdparty
+++ b/3rdparty
@@ -1 +1 @@
-Subproject commit 5142d69c5c467c651a7ef72ea1f09dcfb7ba25b5
+Subproject commit 59f092231c6036838746262a4db80997908bb06f

From bdfc9b57bdf6d7660ac30341d7ca4c4a3419d34b 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 7dd4168fb6..23104b1bc2 100644
--- a/lib/private/db/mdb2schemareader.php
+++ b/lib/private/db/mdb2schemareader.php
@@ -293,6 +293,9 @@ class MDB2SchemaReader {
 		}
 		if (!empty($fields)) {
 			if (isset($primary) && $primary) {
+				if ($table->hasPrimaryKey()) {
+					return;
+				}
 				$table->setPrimaryKey($fields, $name);
 			} else {
 				if (isset($unique) && $unique) {