Fix merge conflicts

libraries/engines/bdb.lib.php

@@ -7,6 +7,10 @@ if (! defined('PHPMYADMIN')) {
     exit;
 }
 
+if (! defined('PHPMYADMIN')) {
+    exit;
+}
+
 /**
  *
  * @package PhpMyAdmin-Engines

libraries/engines/berkeleydb.lib.php

@@ -7,6 +7,10 @@ if (! defined('PHPMYADMIN')) {
     exit;
 }
 
+if (! defined('PHPMYADMIN')) {
+    exit;
+}
+
 /**
  * Load BDB class.
  */

libraries/engines/binlog.lib.php

@@ -7,6 +7,10 @@ if (! defined('PHPMYADMIN')) {
     exit;
 }
 
+if (! defined('PHPMYADMIN')) {
+    exit;
+}
+
 /**
  *
  * @package PhpMyAdmin-Engines

libraries/engines/innobase.lib.php

@@ -8,6 +8,10 @@ if (! defined('PHPMYADMIN')) {
     exit;
 }
 
+if (! defined('PHPMYADMIN')) {
+    exit;
+}
+
 /**
  *
  */

libraries/engines/innodb.lib.php

@@ -9,6 +9,10 @@ if (! defined('PHPMYADMIN')) {
     exit;
 }
 
+if (! defined('PHPMYADMIN')) {
+    exit;
+}
+
 /**
  * The InnoDB storage engine
  *

libraries/engines/memory.lib.php

@@ -9,6 +9,10 @@ if (! defined('PHPMYADMIN')) {
     exit;
 }
 
+if (! defined('PHPMYADMIN')) {
+    exit;
+}
+
 /**
  * The MEMORY (HEAP) storage engine
  *

libraries/engines/merge.lib.php

@@ -9,6 +9,10 @@ if (! defined('PHPMYADMIN')) {
     exit;
 }
 
+if (! defined('PHPMYADMIN')) {
+    exit;
+}
+
 /**
  * The MERGE storage engine
  *

libraries/engines/mrg_myisam.lib.php

@@ -7,6 +7,10 @@ if (! defined('PHPMYADMIN')) {
     exit;
 }
 
+if (! defined('PHPMYADMIN')) {
+    exit;
+}
+
 /**
  *
  */

libraries/engines/myisam.lib.php

@@ -9,6 +9,10 @@ if (! defined('PHPMYADMIN')) {
     exit;
 }
 
+if (! defined('PHPMYADMIN')) {
+    exit;
+}
+
 /**
  * The MyISAM storage engine
  *

libraries/engines/ndbcluster.lib.php

@@ -9,6 +9,10 @@ if (! defined('PHPMYADMIN')) {
     exit;
 }
 
+if (! defined('PHPMYADMIN')) {
+    exit;
+}
+
 /**
  * The NDBCLUSTER storage engine
  *

libraries/engines/pbxt.lib.php

@@ -9,6 +9,10 @@ if (! defined('PHPMYADMIN')) {
     exit;
 }
 
+if (! defined('PHPMYADMIN')) {
+    exit;
+}
+
 /**
  * The PBXT storage engine
  *