[geeklog-cvs] geeklog: Attempting to install with InnoDB tables failed with "c...

[geeklog-cvs at lists.geeklog.net]

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/27241d25a32d
changeset: 7259:27241d25a32d
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat Aug 29 19:35:18 2009 +0200
description:
Attempting to install with InnoDB tables failed with "could not find the database"

diffstat:

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

diffs (22 lines):

diff -r 67ec3d77f138 -r 27241d25a32d public_html/admin/install/lib-install.php
--- a/public_html/admin/install/lib-install.php	Sat Aug 29 18:48:59 2009 +0200
+++ b/public_html/admin/install/lib-install.php	Sat Aug 29 19:35:18 2009 +0200
@@ -370,6 +370,9 @@
                 'pass' => (isset($db['pass']) ? $db['pass'] : $_DB_pass),
                 'table_prefix' => (isset($db['table_prefix']) ? $db['table_prefix'] : $_DB_table_prefix),
                 'type' => (isset($db['type']) ? $db['type'] : $_DB_dbms) );
+    if ($db['type'] == 'mysql-innodb') {
+        $db['type'] = 'mysql';
+    }
 
     // Read in db-config.php so we can insert the DB information
     $dbconfig_file = fopen($config_file, 'r');
@@ -450,6 +453,8 @@
     $db_exists = false;
     switch ($db['type']) {
     case 'mysql':
+        // deliberate fallthrough - no "break"
+    case 'mysql-innodb':
         if (@mysql_select_db($db['name'], $db_handle)) {
             return true;
         }