Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new

into  zim.(none):/home/brian/mysql/slap-5.1

storage/archive/archive_test.c

@@ -43,6 +43,6 @@ int main(int argc, char *argv[])
   azclose(&foo);
   azclose(&foo1);
 
-  //unlink("test");
+  /* unlink("test"); */
   return 0;
 }

storage/archive/azio.c

@@ -166,7 +166,7 @@ int get_byte(s)
     if (s->stream.avail_in == 0) 
     {
       s->z_eof = 1;
-      // if (ferror(s->file)) s->z_err = Z_ERRNO;
+      /* if (ferror(s->file)) s->z_err = Z_ERRNO; */
       return EOF;
     }
     s->stream.next_in = s->inbuf;