Drizzle

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

  1. rm_my_symlink
  2. Merge into 7.2-staging
Proposed by Eric Lambert
Status: Merged
Merged at revision: not available
Proposed branch: lp:~elambert/drizzle/rm_my_symlink
Merge into: lp:~drizzle-trunk/drizzle/7.2-staging
Diff against target: None lines
To merge this branch: bzr merge lp:~elambert/drizzle/rm_my_symlink
Reviewer Review Type Date Requested Status
Drizzle Developers Pending
Review via email: mp+7659@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Eric Lambert (elambert) wrote :

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'mysys/mf_format.cc'
2--- mysys/mf_format.cc 2009-06-16 01:36:01 +0000
3+++ mysys/mf_format.cc 2009-06-18 17:36:19 +0000
4@@ -100,7 +100,7 @@
5 struct stat stat_buff;
6 char rp_buff[PATH_MAX];
7 if ((!flag & MY_RESOLVE_SYMLINKS) ||
8- (!lstat(to,&stat_buff)) && S_ISLNK(stat_buff.st_mode))
9+ (!lstat(to,&stat_buff) && S_ISLNK(stat_buff.st_mode)))
10 {
11 if (!realpath(to,rp_buff))
12 my_load_path(rp_buff, to, NULL);
13
14=== modified file 'plugin/archive/ha_archive.cc'
15--- plugin/archive/ha_archive.cc 2009-06-16 22:00:52 +0000
16+++ plugin/archive/ha_archive.cc 2009-06-18 17:36:19 +0000
17@@ -578,7 +578,8 @@
18 }
19
20 if (linkname[0])
21- (void)symlink(name_buff, linkname);
22+ if(symlink(name_buff, linkname) != 0)
23+ goto error2;
24 fn_format(name_buff, table_name, "", ".frm",
25 MY_REPLACE_EXT | MY_UNPACK_FILENAME);
26

Subscribers

People subscribed via source and target branches