Index: cache.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/cache.inc,v
retrieving revision 1.20
diff -u -r1.20 cache.inc
--- cache.inc	2 Jul 2008 20:42:25 -0000	1.20
+++ cache.inc	17 Aug 2008 21:34:35 -0000
@@ -21,7 +21,7 @@
     // Reset the variable immediately to prevent a meltdown in heavy load situations.
     variable_set('cache_flush', 0);
     // Time to flush old cache data
-    db_query("DELETE FROM {" . $table . "} WHERE expire != %d AND expire <= %d", CACHE_PERMANENT, $cache_flush);
+    db_query("DELETE FROM {" . $table . "} WHERE expire <> %d AND expire <= %d", CACHE_PERMANENT, $cache_flush);
   }
 
   $cache = db_fetch_object(db_query("SELECT data, created, headers, expire, serialized FROM {" . $table . "} WHERE cid = '%s'", $cid));
@@ -158,13 +158,13 @@
       else if (time() > ($cache_flush + variable_get('cache_lifetime', 0))) {
         // Clear the cache for everyone, cache_flush_delay seconds have
         // passed since the first request to clear the cache.
-        db_query("DELETE FROM {" . $table . "} WHERE expire != %d AND expire < %d", CACHE_PERMANENT, time());
+        db_query("DELETE FROM {" . $table . "} WHERE expire <> %d AND expire < %d", CACHE_PERMANENT, time());
         variable_set('cache_flush', 0);
       }
     }
     else {
       // No minimum cache lifetime, flush all temporary cache entries now.
-      db_query("DELETE FROM {" . $table . "} WHERE expire != %d AND expire < %d", CACHE_PERMANENT, time());
+      db_query("DELETE FROM {" . $table . "} WHERE expire <> %d AND expire < %d", CACHE_PERMANENT, time());
     }
   }
   else {
@@ -173,7 +173,7 @@
         db_query("DELETE FROM {" . $table . "}");
       }
       else {
-        db_query("DELETE FROM {" . $table . "} WHERE cid LIKE '%s%%'", $cid);
+        db_query("DELETE FROM {" . $table . "} WHERE cid LIKE '%s'", $cid ."%");
       }
     }
     else {