From 7bfe445f9919716460e006faf7aa226279944e23 Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Mon, 15 Jul 2013 15:45:25 -0400
Subject: [PATCH] Fix merge conflicts

---
 libraries/engines/bdb.lib.php        | 4 ++++
 libraries/engines/berkeleydb.lib.php | 4 ++++
 libraries/engines/binlog.lib.php     | 4 ++++
 libraries/engines/innobase.lib.php   | 4 ++++
 libraries/engines/innodb.lib.php     | 4 ++++
 libraries/engines/memory.lib.php     | 4 ++++
 libraries/engines/merge.lib.php      | 4 ++++
 libraries/engines/mrg_myisam.lib.php | 4 ++++
 libraries/engines/myisam.lib.php     | 4 ++++
 libraries/engines/ndbcluster.lib.php | 4 ++++
 libraries/engines/pbxt.lib.php       | 4 ++++
 11 files changed, 44 insertions(+)

diff --git a/libraries/engines/bdb.lib.php b/libraries/engines/bdb.lib.php
index 91a56bb57f..3e1e9f912c 100644
--- a/libraries/engines/bdb.lib.php
+++ b/libraries/engines/bdb.lib.php
@@ -7,6 +7,10 @@ if (! defined('PHPMYADMIN')) {
     exit;
 }
 
+if (! defined('PHPMYADMIN')) {
+    exit;
+}
+
 /**
  *
  * @package PhpMyAdmin-Engines
diff --git a/libraries/engines/berkeleydb.lib.php b/libraries/engines/berkeleydb.lib.php
index d5324b1acd..52f6280978 100644
--- a/libraries/engines/berkeleydb.lib.php
+++ b/libraries/engines/berkeleydb.lib.php
@@ -7,6 +7,10 @@ if (! defined('PHPMYADMIN')) {
     exit;
 }
 
+if (! defined('PHPMYADMIN')) {
+    exit;
+}
+
 /**
  * Load BDB class.
  */
diff --git a/libraries/engines/binlog.lib.php b/libraries/engines/binlog.lib.php
index ea81738967..e6a4df0eb9 100644
--- a/libraries/engines/binlog.lib.php
+++ b/libraries/engines/binlog.lib.php
@@ -7,6 +7,10 @@ if (! defined('PHPMYADMIN')) {
     exit;
 }
 
+if (! defined('PHPMYADMIN')) {
+    exit;
+}
+
 /**
  *
  * @package PhpMyAdmin-Engines
diff --git a/libraries/engines/innobase.lib.php b/libraries/engines/innobase.lib.php
index f81ae3f3b9..9c95a8ece7 100644
--- a/libraries/engines/innobase.lib.php
+++ b/libraries/engines/innobase.lib.php
@@ -8,6 +8,10 @@ if (! defined('PHPMYADMIN')) {
     exit;
 }
 
+if (! defined('PHPMYADMIN')) {
+    exit;
+}
+
 /**
  *
  */
diff --git a/libraries/engines/innodb.lib.php b/libraries/engines/innodb.lib.php
index b0eec39ce3..62634076d1 100644
--- a/libraries/engines/innodb.lib.php
+++ b/libraries/engines/innodb.lib.php
@@ -9,6 +9,10 @@ if (! defined('PHPMYADMIN')) {
     exit;
 }
 
+if (! defined('PHPMYADMIN')) {
+    exit;
+}
+
 /**
  * The InnoDB storage engine
  *
diff --git a/libraries/engines/memory.lib.php b/libraries/engines/memory.lib.php
index 8e9fe5fc88..819b9c0663 100644
--- a/libraries/engines/memory.lib.php
+++ b/libraries/engines/memory.lib.php
@@ -9,6 +9,10 @@ if (! defined('PHPMYADMIN')) {
     exit;
 }
 
+if (! defined('PHPMYADMIN')) {
+    exit;
+}
+
 /**
  * The MEMORY (HEAP) storage engine
  *
diff --git a/libraries/engines/merge.lib.php b/libraries/engines/merge.lib.php
index 4bccfc79ca..22d6a759dd 100644
--- a/libraries/engines/merge.lib.php
+++ b/libraries/engines/merge.lib.php
@@ -9,6 +9,10 @@ if (! defined('PHPMYADMIN')) {
     exit;
 }
 
+if (! defined('PHPMYADMIN')) {
+    exit;
+}
+
 /**
  * The MERGE storage engine
  *
diff --git a/libraries/engines/mrg_myisam.lib.php b/libraries/engines/mrg_myisam.lib.php
index d3425365c2..eadccd0578 100644
--- a/libraries/engines/mrg_myisam.lib.php
+++ b/libraries/engines/mrg_myisam.lib.php
@@ -7,6 +7,10 @@ if (! defined('PHPMYADMIN')) {
     exit;
 }
 
+if (! defined('PHPMYADMIN')) {
+    exit;
+}
+
 /**
  *
  */
diff --git a/libraries/engines/myisam.lib.php b/libraries/engines/myisam.lib.php
index 5882824bc4..456bf294c3 100644
--- a/libraries/engines/myisam.lib.php
+++ b/libraries/engines/myisam.lib.php
@@ -9,6 +9,10 @@ if (! defined('PHPMYADMIN')) {
     exit;
 }
 
+if (! defined('PHPMYADMIN')) {
+    exit;
+}
+
 /**
  * The MyISAM storage engine
  *
diff --git a/libraries/engines/ndbcluster.lib.php b/libraries/engines/ndbcluster.lib.php
index e57846b601..74d2b2b953 100644
--- a/libraries/engines/ndbcluster.lib.php
+++ b/libraries/engines/ndbcluster.lib.php
@@ -9,6 +9,10 @@ if (! defined('PHPMYADMIN')) {
     exit;
 }
 
+if (! defined('PHPMYADMIN')) {
+    exit;
+}
+
 /**
  * The NDBCLUSTER storage engine
  *
diff --git a/libraries/engines/pbxt.lib.php b/libraries/engines/pbxt.lib.php
index fc4e343f5e..180279b090 100644
--- a/libraries/engines/pbxt.lib.php
+++ b/libraries/engines/pbxt.lib.php
@@ -9,6 +9,10 @@ if (! defined('PHPMYADMIN')) {
     exit;
 }
 
+if (! defined('PHPMYADMIN')) {
+    exit;
+}
+
 /**
  * The PBXT storage engine
  *