Changeset 341

Timestamp:

10/15/08 22:31:54 (12 years ago)

Author:

ralle

Message:

InnoDB Engine is now chooseable in installer (inclusive server check for selected Engine)

Location:

dev/install

Files:

• install_step3.php (modified) (4 diffs)
• install_step4.php (modified) (1 diff)

dev/install/install_step3.php

@@ -9 +9 @@
     $_SESSION['sql']['pass'] = $_POST['dbpass'];
     $_SESSION['sql']['db'] = $_POST['db'];
+    $_SESSION['sql']['engine'] = $_POST['engine'];
 }
 
@@ -37 +38 @@
 <tr><td width="120"><b>Password:</b></td><td><input type=text name=dbpass id=pass size=20 maxlength=80 value="<?php echo $_SESSION['sql']['pass']; ?>"></td></tr>
 <tr><td width="120"><b>Database:</b></td><td><input type=text name=db id=db size=20 maxlength=80 value="<?php echo $_SESSION['sql']['db']; ?>"></td></tr>
+<tr><td width="120"><b>Engine:</b></td><td><input type=radio name=engine id=engine value="MyISAM"> MyISAM <input type=radio name=engine id=engine value="InnoDB">InnoDB</tr>
 <tr><td width="120"></td><td><input type=submit name=submit value="Test"></td></tr>
 </table>
@@ -62 +64 @@
             if (mysql_select_db($_SESSION['sql']['db']))
             {
-                echo 'Successfully selected database "'.$_SESSION['sql']['db'].'", everything is fine to continue.<br/>';
+                echo 'Successfully selected database "'.$_SESSION['sql']['db'].'", everything seems fine to continue.<br/>';
                 $stoppage = false;
+                
+                //InnoDB check
+                if ($stoppage == false && $_SESSION['sql']['engine'] == 'InnoDB'){
+                        echo "</br>Checking Database Engine InnoDB.. <br/>";
+                        $stoppage = true;
+                        $result = mysql_query('SHOW ENGINES;');
+                        while (($row = mysql_fetch_row($result)) &&  $stoppage == true){
+                                if ($row[0] == 'InnoDB'){ 
+                                        if ($row[1] == 'YES' || $row[1] == 'DEFAULT'){ // (YES / NO / DEFAULT)
+                                                $stoppage = false;
+                                        }
+                                }
+                        }
+                        if ($stoppage){
+                                echo 'Error: InnoDB is not supported on your MySQL Server.</br>'; 
+                        }else{
+                                echo 'InnoDB is supported on your MySQL Server.</br>'; 
+                        }
+                }
+                
+                
             }
             else
@@ -76 +99 @@
     }
 }
+die();
 ?>
 

dev/install/install_step4.php

@@ -72 +72 @@
         {
             echo 'done<br/>';
+                if $_SESSION['sql']['engine'] == "InnoDB"{
+                        echo 'Altering table '. $table .' into InnoDB...';
+                        $id = mysql_query('ALTER TABLE '.$table.' ENGINE=InnoDB;');
+                        if ($id)
+                        {
+                            echo 'done<br/>';
+                        }
+                        else
+                        {
+                        echo 'error: '.mysql_error().'<br/>';
+                        }       
+                }
         }
         else