--- comment_notify.install	2008-10-07 04:24:55.000000000 +1300
+++ comment_notify.install_new	2009-05-22 16:16:44.000000000 +1200
@@ -28,7 +28,7 @@ function comment_notify_install() {
         PRIMARY KEY (cid)
       )");
       $status[] = db_query("CREATE INDEX {comment_notify}_notify_hash_idx ON {comment_notify} (notify_hash)");
-      $status[] = db_query("INSERT INTO {comment_notify} (cid, notify, notify_hash) SELECT c.cid, 0, md5(concat(c.mail, ifnull(u.mail, u.init), c.uid, c.name, c.nid)) FROM {comments} c LEFT OUTER JOIN {users} u on c.uid = u.uid");
+      $status[] = db_query("INSERT INTO {comment_notify} (cid, notify, notify_hash) SELECT c.cid, 0, md5(c.mail ||COALESCE(u.mail, u.init) || c.uid || c.name || c.nid) FROM {comments} c LEFT OUTER JOIN {users} u on c.uid = u.uid");
       break;
   }
   
@@ -101,6 +101,8 @@ function comment_notify_update_4() {
  * Break out to our own table.
  */
 function comment_notify_update_5() {
+  $ret = array();
+  
   // Create the new tables...
   switch ($GLOBALS['db_type']) {
     case 'mysql':
@@ -112,6 +114,9 @@ function comment_notify_update_5() {
         PRIMARY KEY (cid),
         KEY notify_hash (notify_hash)
       ) /*!40100 DEFAULT CHARACTER SET UTF8 */ ");
+      
+      // Move the data over there from the previous location.
+      $ret[] = update_sql("INSERT INTO {comment_notify} (cid, notify, notify_hash) SELECT c.cid, c.notify, md5(concat(c.mail, ifnull(u.mail, u.init), c.uid, c.name, c.nid)) FROM {comments} c INNER JOIN {users} u on c.uid = u.uid");
       break;
     case 'pgsql':
       db_query("CREATE TABLE {comment_notify} (
@@ -121,12 +126,12 @@ function comment_notify_update_5() {
         PRIMARY KEY (cid)
       )");
       db_query("CREATE INDEX {comment_notify}_notify_hash_idx ON {comment_notify} (notify_hash)");
+
+      // Move the data over there from the previous location.
+      $ret[] = update_sql("INSERT INTO {comment_notify} (cid, notify, notify_hash) SELECT c.cid, c.notify, md5(c.mail || COALESCE(u.mail, u.init) || c.uid || c.name || c.nid) FROM {comments} c INNER JOIN {users} u on c.uid = u.uid");
       break;
   }
 
-  // Move the data over there from the previous location.
-  $ret = array();
-  $ret[] = update_sql("INSERT INTO {comment_notify} (cid, notify, notify_hash) SELECT c.cid, c.notify, md5(concat(c.mail, ifnull(u.mail, u.init), c.uid, c.name, c.nid)) FROM {comments} c INNER JOIN {users} u on c.uid = u.uid");
   return $ret;
 
   // TODO alter the comments table to remove my column?