diff --git a/3rdparty b/3rdparty
index 5142d69c5c467c651a7ef72ea1f09dcfb7ba25b5..59f092231c6036838746262a4db80997908bb06f 160000
--- a/3rdparty
+++ b/3rdparty
@@ -1 +1 @@
-Subproject commit 5142d69c5c467c651a7ef72ea1f09dcfb7ba25b5
+Subproject commit 59f092231c6036838746262a4db80997908bb06f
diff --git a/lib/private/db/mdb2schemareader.php b/lib/private/db/mdb2schemareader.php
index efd0b26c9ea3a2787ed0ed9cdadd6de64ed658c2..3d507760625828e8bf1fc9a9c518d359bf12bf94 100644
--- a/lib/private/db/mdb2schemareader.php
+++ b/lib/private/db/mdb2schemareader.php
@@ -312,6 +312,9 @@ class MDB2SchemaReader {
 		}
 		if (!empty($fields)) {
 			if (isset($primary) && $primary) {
+				if ($table->hasPrimaryKey()) {
+					return;
+				}
 				$table->setPrimaryKey($fields, $name);
 			} else {
 				if (isset($unique) && $unique) {