From 10864e96f8a79dba385a1c1a41a056cbd9f5387b Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Fri, 4 Feb 2005 11:13:01 +0000
Subject: [PATCH] fixed error with fulltext indexes (eg. in the wiki), when the
 default-type-type is set to InnoDB, which is eg. the default for some newer
 windows installs or mysql 4.1.x

---
 phpgwapi/inc/adodb/datadict/datadict-mysql.inc.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/phpgwapi/inc/adodb/datadict/datadict-mysql.inc.php b/phpgwapi/inc/adodb/datadict/datadict-mysql.inc.php
index 0094f9139d..f17a0376b3 100644
--- a/phpgwapi/inc/adodb/datadict/datadict-mysql.inc.php
+++ b/phpgwapi/inc/adodb/datadict/datadict-mysql.inc.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
-  V4.52 10 Aug 2004  (c) 2000-2004 John Lim (jlim@natsoft.com.my). All rights reserved.
+  V4.54 5 Nov 2004  (c) 2000-2004 John Lim (jlim@natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.
@@ -93,10 +93,10 @@ class ADODB2_mysql extends ADODB_DataDict {
 		case 'L': return 'TINYINT';
 		
 		case 'R':
+		case 'I4':
 		case 'I': return 'INTEGER';
 		case 'I1': return 'TINYINT';
 		case 'I2': return 'SMALLINT';
-		case 'I4': return 'INTEGER';	// MEDIUMINT is actualy a I3
 		case 'I8': return 'BIGINT';
 		
 		case 'F': return 'DOUBLE';
@@ -157,6 +157,8 @@ class ADODB2_mysql extends ADODB_DataDict {
 		
 		if (isset($idxoptions['FULLTEXT'])) {
 			$unique = ' FULLTEXT';
+			// fulltext indexes are only allowed for MyISAM tables (changing MyISAM tables to MyISAM does no harm)
+			$sql[] = "ALTER TABLE $tabname TYPE=MyISAM";
 		} elseif (isset($idxoptions['UNIQUE'])) {
 			$unique = ' UNIQUE';
 		} else {
@@ -178,4 +180,4 @@ class ADODB2_mysql extends ADODB_DataDict {
 		return $sql;
 	}
 }
-?>
+?>
\ No newline at end of file