diff -rau elgg1.6.1/engine/lib/annotations.php elgg_cluster/engine/lib/annotations.php
--- elgg1.6.1/engine/lib/annotations.php	2009-09-07 10:14:26.000000000 +0100
+++ elgg_cluster/engine/lib/annotations.php	2009-09-21 19:25:09.000000000 +0100
@@ -942,4 +942,4 @@
 	
 	/** Register the hook */
 	register_plugin_hook("export", "all", "export_annotation_plugin_hook", 2);
-?>
\ No newline at end of file
+?>
Only in elgg_cluster/engine/lib: annotations.php~
diff -rau elgg1.6.1/engine/lib/metastrings.php elgg_cluster/engine/lib/metastrings.php
--- elgg1.6.1/engine/lib/metastrings.php	2009-09-07 10:14:26.000000000 +0100
+++ elgg_cluster/engine/lib/metastrings.php	2009-09-21 19:34:32.000000000 +0100
@@ -25,7 +25,8 @@
 	function get_metastring_id($string, $case_sensitive = true)
 	{
 		global $CONFIG, $METASTRINGS_CACHE, $METASTRINGS_DEADNAME_CACHE;
-		
+
+		$string_index = sanitise_string(substr($string, 0, 50));				
 		$string = sanitise_string($string);
 		$result = array_search($string, $METASTRINGS_CACHE);
 		if ($result!==false) {
@@ -51,8 +52,8 @@
 		// Case sensitive
 		$cs = "";
 		if ($case_sensitive) $cs = " BINARY ";
-		
-		$row = get_data_row("SELECT * from {$CONFIG->dbprefix}metastrings where string=$cs'$string' limit 1");
+
+		$row = get_data_row("SELECT * from {$CONFIG->dbprefix}metastrings where string=$cs'$string' and string_index='$string_index' limit 1");
 		if ($row) { 
 			$METASTRINGS_CACHE[$row->id] = $row->string; // Cache it
 			
@@ -117,11 +118,12 @@
 		global $CONFIG, $METASTRINGS_CACHE, $METASTRINGS_DEADNAME_CACHE;
 		
 		$sanstring = sanitise_string($string);
+		$sanstring_index = sanitise_string(substr($string,0,50));
 		
 		$id = get_metastring_id($string, $case_sensitive);
 		if ($id) return $id;
-		
-		$result = insert_data("INSERT into {$CONFIG->dbprefix}metastrings (string) values ('$sanstring')");
+
+		$result = insert_data("INSERT into {$CONFIG->dbprefix}metastrings (string, string_index) values ('$sanstring', '$sanstring_index')");
 		if ($result) {
 			$METASTRINGS_CACHE[$result] = $string;
 			if (isset($METASTRINGS_DEADNAME_CACHE[$string])) unset($METASTRINGS_DEADNAME_CACHE[$string]);
@@ -175,4 +177,4 @@
 		return delete_data($query);
 	}
 	
-?>
\ No newline at end of file
+?>
Only in elgg_cluster/engine/lib: metastrings.php~
diff -rau elgg1.6.1/engine/lib/system_log.php elgg_cluster/engine/lib/system_log.php
--- elgg1.6.1/engine/lib/system_log.php	2009-09-07 10:14:26.000000000 +0100
+++ elgg_cluster/engine/lib/system_log.php	2009-09-21 19:24:57.000000000 +0100
@@ -185,7 +185,7 @@
 	 */
 	function system_log($object, $event)
 	{
-		global $CONFIG;
+		/*global $CONFIG;
 		static $logcache;
 
 		if ($object instanceof Loggable)
@@ -225,7 +225,7 @@
 			
 			return true;
 			
-		}
+		}*/
 	}
 	
 	/**
@@ -294,4 +294,4 @@
 	/** Register a default system log handler */
 	register_elgg_event_handler('log','systemlog','system_log_default_logger', 999);
 	
-?>
\ No newline at end of file
+?>
Only in elgg_cluster/engine/lib: system_log.php~
diff -rau elgg1.6.1/engine/schema/mysql.sql elgg_cluster/engine/schema/mysql.sql
--- elgg1.6.1/engine/schema/mysql.sql	2009-09-07 10:14:26.000000000 +0100
+++ elgg_cluster/engine/schema/mysql.sql	2009-09-21 19:05:54.000000000 +0100
@@ -1,5 +1,6 @@
 --
--- Main Elgg database
+-- Main Elgg database - Mysql cluster compatible version
+-- @author Marcus Povey <marcus@dushka.co.uk>
 -- 
 -- @link http://elgg.org/
 --
@@ -16,7 +17,7 @@
   `value` text NOT NULL,
   `site_guid` int(11) NOT NULL,
   PRIMARY KEY  (`name`,`site_guid`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+) ENGINE=ndbcluster DEFAULT CHARSET=utf8;
 
 -- Define entities. 
 CREATE TABLE `prefix_entities` (
@@ -44,7 +45,7 @@
 	KEY `access_id` (`access_id`),
 	KEY `time_created` (`time_created`),
 	KEY `time_updated` (`time_updated`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+) ENGINE=ndbcluster DEFAULT CHARSET=utf8;
 
 -- Entity subtypes - lets you subtype one of the main objects (sites/objects/etc)
 CREATE TABLE `prefix_entity_subtypes` (
@@ -57,7 +58,7 @@
 	
 	PRIMARY KEY (`id`),
 	UNIQUE KEY (`type`, `subtype`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+) ENGINE=ndbcluster DEFAULT CHARSET=utf8;
 
 -- Describe relationships between entities, can describe friendships but also site membership, depending on context
 CREATE TABLE `prefix_entity_relationships` (
@@ -70,7 +71,7 @@
   UNIQUE KEY (`guid_one`,`relationship`,`guid_two`),
   KEY `relationship` (`relationship`),
   KEY `guid_two` (`guid_two`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+) ENGINE=ndbcluster DEFAULT CHARSET=utf8;
 
 --
 -- *** Access controls ***
@@ -86,14 +87,14 @@
   PRIMARY KEY  (`id`),
   KEY `owner_guid` (`owner_guid`),
   KEY `site_guid` (`site_guid`)
-) AUTO_INCREMENT=3  ENGINE=MyISAM DEFAULT CHARSET=utf8;
+) AUTO_INCREMENT=3  ENGINE=ndbcluster DEFAULT CHARSET=utf8;
 
 -- Access containers 
 CREATE TABLE `prefix_access_collection_membership` (
   `user_guid` int(11) NOT NULL,
   `access_collection_id` int(11) NOT NULL,
   PRIMARY KEY  (`user_guid`,`access_collection_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+) ENGINE=ndbcluster DEFAULT CHARSET=utf8;
 
 
 --
@@ -108,9 +109,8 @@
   `title` text NOT NULL,
   `description` text NOT NULL,
 
-  PRIMARY KEY  (`guid`),
-  FULLTEXT KEY (`title`,`description`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+  PRIMARY KEY  (`guid`)
+) ENGINE=ndbcluster DEFAULT CHARSET=utf8;
 
 -- Extra information relating to "sites"
 CREATE TABLE `prefix_sites_entity` (
@@ -121,9 +121,8 @@
   `url` varchar(255) NOT NULL, 
    
   PRIMARY KEY  (`guid`),
-  UNIQUE KEY (`url`),
-  FULLTEXT KEY (`name`,`description`, `url`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+  UNIQUE KEY (`url`)
+) ENGINE=ndbcluster DEFAULT CHARSET=utf8;
 
 -- Extra information relating to "users"
 CREATE TABLE `prefix_users_entity` (
@@ -133,7 +132,7 @@
   `username` varchar(128) NOT NULL default '',
   `password` varchar(32) NOT NULL default '',
   `salt`     varchar(8)  NOT NULL default '',
-  `email` text NOT NULL,
+  `email` varchar(255) NOT NULL,
   `language` varchar(6)  NOT NULL default '',
   `code` varchar(32) NOT NULL default '',
   `banned` enum ('yes', 'no') NOT NULL default 'no',
@@ -146,26 +145,22 @@
   PRIMARY KEY  (`guid`),
   UNIQUE KEY (`username`),
   KEY `password` (`password`),
-  KEY `email` (`email`(50)),
+  KEY `email` (`email`),
   KEY `code` (`code`),
   KEY `last_action` (`last_action`),
-  KEY `last_login` (`last_login`),
-  FULLTEXT KEY `name` (`name`),
-  FULLTEXT KEY (`name`,`username`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+  KEY `last_login` (`last_login`)
+) ENGINE=ndbcluster DEFAULT CHARSET=utf8;
 
 -- Extra information relating to "groups"
 CREATE TABLE `prefix_groups_entity` (
   `guid` bigint(20) unsigned  NOT NULL,
   
-  `name` text NOT NULL,
+  `name` varchar(255) NOT NULL,
   `description` text NOT NULL,
    
   PRIMARY KEY  (`guid`),
-  KEY `name` (`name`(50)),
-  KEY `description` (`description`(50)),
-  FULLTEXT KEY (`name`,`description`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+  KEY `name` (`name`)
+) ENGINE=ndbcluster DEFAULT CHARSET=utf8;
 
 --
 -- *** Annotations and tags ***
@@ -195,7 +190,7 @@
 	KEY `owner_guid` (`owner_guid`),
 	KEY `access_id` (`access_id`)
 
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+) ENGINE=ndbcluster DEFAULT CHARSET=utf8;
 
 -- Table structure for metadata
 CREATE TABLE `prefix_metadata` (
@@ -221,16 +216,17 @@
 	KEY `owner_guid` (`owner_guid`),
 	KEY `access_id` (`access_id`)
 
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+) ENGINE=ndbcluster DEFAULT CHARSET=utf8;
 
 -- Meta strings table (avoids storing text strings more than once)
 CREATE TABLE `prefix_metastrings` (
 	`id` int(11) NOT NULL auto_increment,
-	`string` TEXT NOT NULL,
+	`string` TEXT NOT NULL,
+	`string_index` varchar(50) NOT NULL,
 	
 	PRIMARY KEY (`id`),
-	KEY `string` (`string`(50))
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+	KEY `string_index` (`string_index`)
+) ENGINE=ndbcluster DEFAULT CHARSET=utf8;
 
 --
 -- *** Misc ***
@@ -248,7 +244,7 @@
 	
 	unique key (api_key),
 	primary key (id)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+) ENGINE=ndbcluster DEFAULT CHARSET=utf8;
 
 -- API Sessions
 CREATE TABLE `prefix_users_apisessions` (
@@ -263,7 +259,7 @@
 	PRIMARY KEY  (`id`),
 	UNIQUE KEY (`user_guid`,`site_guid`),
 	KEY `token` (`token`)
-) ENGINE=MEMORY;
+) ENGINE=ndbcluster;
 
 -- HMAC Cache protecting against Replay attacks
 CREATE TABLE `prefix_hmac_cache` (
@@ -272,7 +268,7 @@
 
 	PRIMARY KEY  (`hmac`),
 	KEY `ts` (`ts`)
-) ENGINE=MEMORY;
+) ENGINE=ndbcluster;
 
 -- Geocode engine cache
 CREATE TABLE `prefix_geocode_cache` (
@@ -284,7 +280,7 @@
 	PRIMARY KEY (`id`),
     UNIQUE KEY `location` (`location`)
 	
-) ENGINE=MEMORY;
+) ENGINE=ndbcluster;
 
 -- PHP Session storage
 CREATE TABLE `prefix_users_sessions` (
@@ -294,14 +290,14 @@
 	
 	PRIMARY KEY `session` (`session`),
 	KEY `ts` (`ts`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+) ENGINE=ndbcluster DEFAULT CHARSET=utf8;
 
 -- Datalists for things like db version
 CREATE TABLE `prefix_datalists` (
   `name` varchar(32) NOT NULL,
   `value` text NOT NULL,
   PRIMARY KEY `name` (`name`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+) ENGINE=ndbcluster DEFAULT CHARSET=utf8;
 
 -- Ultra-private system settings for entities
 CREATE TABLE `prefix_private_settings` (
@@ -311,9 +307,8 @@
 	`value` TEXT NOT NULL ,
 	PRIMARY KEY ( `id` ) ,
 	UNIQUE KEY ( `entity_guid` , `name` ),
-	KEY `name` (`name`),
-	KEY `value` (`value` (50))
-) ENGINE = MYISAM  DEFAULT CHARSET=utf8;
+	KEY `name` (`name`)
+) ENGINE = ndbcluster  DEFAULT CHARSET=utf8;
 
 -- System log
 CREATE TABLE `prefix_system_log` (
@@ -345,7 +340,7 @@
 	KEY `access_id` (`access_id`),
 	KEY `time_created` (`time_created`),
 	KEY `river_key` (`object_type`, `object_subtype`, `event`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+) ENGINE=ndbcluster DEFAULT CHARSET=utf8;
 
 -- River
  CREATE TABLE `prefix_river` (
@@ -365,4 +360,4 @@
 	KEY `subject_guid` (`subject_guid`),
 	KEY `object_guid` (`object_guid`),
 	KEY `posted` (`posted`)
-) ENGINE = MYISAM DEFAULT CHARSET=utf8; 
+) ENGINE = ndbcluster DEFAULT CHARSET=utf8; 
Only in elgg_cluster/engine/schema: mysql.sql~
Only in elgg_cluster/engine: settings.php
Only in elgg_cluster/engine: settings.php~
Only in elgg_cluster: .htaccess
diff -rau elgg1.6.1/version.php elgg_cluster/version.php
--- elgg1.6.1/version.php	2009-09-07 10:14:26.000000000 +0100
+++ elgg_cluster/version.php	2009-09-18 12:03:49.000000000 +0100
@@ -14,6 +14,6 @@
 	   $version = 2009072201;  // YYYYMMDD   = Elgg Date
 	                           //         XX = Interim incrementer
 	
-	   $release = '1.6.1';    // Human-friendly version name
+	   $release = '1.6.1 - cluster';    // Human-friendly version name
 
 ?>
Only in elgg_cluster: version.php~