[geeklog-cvs] geeklog: Updated test for InnoDB support

[geeklog-cvs at lists.geeklog.net]

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/5a4350785ae2
changeset: 7308:5a4350785ae2
user:      Dirk Haun <dirk at haun-online.de>
date:      Fri Sep 11 17:40:06 2009 +0200
description:
Updated test for InnoDB support

diffstat:

 public_html/admin/install/lib-upgrade.php |  18 +++++++++++++-----
 1 files changed, 13 insertions(+), 5 deletions(-)

diffs (31 lines):

diff -r 7a9baf0e966a -r 5a4350785ae2 public_html/admin/install/lib-upgrade.php
--- a/public_html/admin/install/lib-upgrade.php	Fri Sep 11 16:48:28 2009 +0200
+++ b/public_html/admin/install/lib-upgrade.php	Fri Sep 11 17:40:06 2009 +0200
@@ -765,14 +765,22 @@
  */
 function INST_innodbSupported()
 {
-    $result = DB_query("SHOW VARIABLES LIKE 'have_innodb'");
-    $A = DB_fetchArray($result, true);
+    $retval = false;
 
-    if (strcasecmp($A[1], 'yes') == 0) {
-        return true;
+    $result = DB_query("SHOW TABLE TYPES");
+    $numEngines = DB_numRows($result);
+    for ($i = 0; $i < $numEngines; $i++) {
+        $A = DB_fetchArray($result);
+
+        if (strcasecmp($A['Engine'], 'InnoDB') == 0) {
+            if (strcasecmp($A['Support'], 'yes') == 0) {
+                $retval = true;
+            }
+            break;
+        }
     }
 
-    return false;
+    return $retval;
 }