From f4173870e756d6e3a6a113b2c99b9236bda9dfbb Mon Sep 17 00:00:00 2001
From: Kazuki Przyborowski <kazuki.przyborowski@gmail.com>
Date: Sat, 23 Apr 2011 20:42:06 +0000
Subject: [PATCH] Small update.

git-svn-id: svn://svn.code.sf.net/p/intdb/svn/trunk@635 2b68903e-0b30-0410-9a39-a2e4f3c5be39
---
 inc/versioninfo.php |  6 +++---
 setup/sql/mysql.php | 24 +++++++++++++++++++++---
 2 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/inc/versioninfo.php b/inc/versioninfo.php
index 94519c2..b65f5f1 100644
--- a/inc/versioninfo.php
+++ b/inc/versioninfo.php
@@ -11,7 +11,7 @@
     Copyright 2004-2011 iDB Support - http://idb.berlios.de/
     Copyright 2004-2011 Game Maker 2k - http://gamemaker2k.org/
 
-    $FileInfo: versioninfo.php - Last Update: 04/19/2011 SVN 634 - Author: cooldude2k $
+    $FileInfo: versioninfo.php - Last Update: 04/23/2011 SVN 635 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="versioninfo.php"||$File3Name=="/versioninfo.php") {
@@ -27,8 +27,8 @@ function version_info($proname,$subver,$ver,$supver,$reltype,$svnver,$showsvn) {
 	return $return_var; }
 // Version number and date stuff. :P
 $VER1[0] = 0; $VER1[1] = 4; $VER1[2] = 3; $VERFull[1] = $VER1[0].".".$VER1[1].".".$VER1[2];
-$VER2[0] = "Alpha"; $VER2[1] = "Al"; $VER2[2] = "SVN"; $SubVerN = 634;
-$SVNDay[0] = 04; $SVNDay[1] = 19; $SVNDay[2] = 2011; $SVNDay[3] = $SVNDay[0]."/".$SVNDay[1]."/".$SVNDay[2];
+$VER2[0] = "Alpha"; $VER2[1] = "Al"; $VER2[2] = "SVN"; $SubVerN = 635;
+$SVNDay[0] = 04; $SVNDay[1] = 23; $SVNDay[2] = 2011; $SVNDay[3] = $SVNDay[0]."/".$SVNDay[1]."/".$SVNDay[2];
 $AltName = "RDB"; $AltName2 = "ReneeDB"; $RName = "iDB"; $SFName = "IntDB";
 $RFullName = "Internet Discussion Boards"; $AltFullName = "Renee Discussion Boards";
 if(!isset($Settings['usealtname'])) { $Settings['usealtname'] = "no"; }
diff --git a/setup/sql/mysql.php b/setup/sql/mysql.php
index 7ca33b3..caaaacd 100644
--- a/setup/sql/mysql.php
+++ b/setup/sql/mysql.php
@@ -12,7 +12,7 @@
     Copyright 2004-2011 Game Maker 2k - http://gamemaker2k.org/
     iDB Installer made by Game Maker 2k - http://idb.berlios.net/
 
-    $FileInfo: mysql.php - Last Update: 04/05/2011 SVN 627 - Author: cooldude2k $
+    $FileInfo: mysql.php - Last Update: 04/23/2011 SVN 635 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="mysql.php"||$File3Name=="/mysql.php") {
@@ -22,8 +22,26 @@ if(!isset($SetupDir['setup'])) { $SetupDir['setup'] = "setup/"; }
 if(!isset($SetupDir['convert'])) { $SetupDir['convert'] = "setup/convert/"; }
 $query=sql_pre_query("ALTER DATABASE \"".$_POST['DatabaseName']."\" DEFAULT CHARACTER SET ".$Settings['sql_charset']." COLLATE ".$Settings['sql_collate'].";", array(null));
 sql_query($query,$SQLStat);
-// You can set this to MyISAM or MARIA
-$SQLStorageEngine = "MyISAM"; 
+if(isset($Settings['sql_storage_engine'])) {
+$result = sql_query(sql_pre_query("SHOW ENGINES;", array(null)),$SQLStat);
+$num = sql_num_rows($result);
+$i = 0; $SQLEngines = null;
+while ($i < $num) {
+$SQLEngines[$i] = sql_result($result,$i,"Engine");
+++$i; }
+if (!in_array($Settings['sql_storage_engine'], $SQLEngines)) {
+    $Settings['sql_storage_engine'] = "MyISAM"; } }
+if(!isset($Settings['sql_storage_engine'])) {
+	$Settings['sql_storage_engine'] = "MyISAM"; }
+// You can set this to MyISAM or Maria/Aria
+if($Settings['sql_storage_engine']=="CSV") {
+	$SQLStorageEngine = "CSV"; }
+if($Settings['sql_storage_engine']=="Maria") {
+	$SQLStorageEngine = "Maria"; }
+if($Settings['sql_storage_engine']=="Aria") {
+	$SQLStorageEngine = "Aria"; }
+if($Settings['sql_storage_engine']=="MyISAM") {
+	$SQLStorageEngine = "MyISAM"; }
 $query=sql_pre_query("CREATE TABLE IF NOT EXISTS \"".$_POST['tableprefix']."categories\" (\n".
 "  \"id\" int(15) NOT NULL auto_increment,\n".
 "  \"OrderID\" int(15) NOT NULL default '0',\n".
-- 
2.11.0