Merge lp:~elambert/drizzle/rm_my_symlink into lp:~drizzle-trunk/drizzle/7.2-staging

[Eric Lambert]

[Eric Lambert (elambert)]

fixed my fix, it turns out that simply casting the results of the symlink function to void did not remove the warning. Also, building on Fedora 10 revealed a warning that my Mac was not generating, have fixed that. Have confirmed this build on Mac OS X and Fedora 10

=== modified file 'mysys/mf_format.cc'
--- mysys/mf_format.cc	2009-06-16 01:36:01 +0000
+++ mysys/mf_format.cc	2009-06-18 17:36:19 +0000
@@ -100,7 +100,7 @@
     struct stat stat_buff;
     char rp_buff[PATH_MAX];
     if ((!flag & MY_RESOLVE_SYMLINKS) || 
-       (!lstat(to,&stat_buff)) && S_ISLNK(stat_buff.st_mode))
+       (!lstat(to,&stat_buff) && S_ISLNK(stat_buff.st_mode)))
     {
       if (!realpath(to,rp_buff))
         my_load_path(rp_buff, to, NULL);
 
=== modified file 'plugin/archive/ha_archive.cc'
--- plugin/archive/ha_archive.cc	2009-06-16 22:00:52 +0000
+++ plugin/archive/ha_archive.cc	2009-06-18 17:36:19 +0000
@@ -578,7 +578,8 @@
   }
 
   if (linkname[0])
-    (void)symlink(name_buff, linkname);
+    if(symlink(name_buff, linkname) != 0)
+      goto error2;
   fn_format(name_buff, table_name, "", ".frm",
 	    MY_REPLACE_EXT | MY_UNPACK_FILENAME);