Merge SCHEMA_WORK into HEAD. Lots of changes, some things are probably broken:

* Page moves/overwrites are a little iffy
* Compression might not be working right
* Profit!

1 files changed, 5 insertions, 4 deletions

diff --git a/includes/SearchMySQL4.php b/includes/SearchMySQL4.php
index a1fa5b38fb4b..a78e41584b43 100644
--- a/includes/SearchMySQL4.php
+++ b/includes/SearchMySQL4.php
@@ -72,11 +72,12 @@ class SearchMySQL4 extends SearchEngine {
 
 	function queryMain( $filteredTerm, $fulltext ) {
 		$match = $this->parseQuery( $filteredTerm, $fulltext );
-		$cur = $this->db->tableName( 'cur' );
+		$page = $this->db->tableName( 'page' );
+		$text = $this->db->tableName( 'text' );
 		$searchindex = $this->db->tableName( 'searchindex' );
-		return 'SELECT cur_id, cur_namespace, cur_title, cur_text ' .
-			"FROM $cur,$searchindex " .
-			'WHERE cur_id=si_page AND ' . $match;
+		return 'SELECT page_id, page_namespace, page_title, old_flags, old_text ' .
+			"FROM $page,$text,$searchindex " .
+			'WHERE page_id=si_page AND page_latest=old_id AND ' . $match;
 	}
 
         function update( $id, $title, $text ) {