Merge lp:~sergei.glushchenko/percona-server/5.6-bug1155859 into lp:percona-server/5.6

Proposed by Sergei Glushchenko
Status: Merged
Approved by: Laurynas Biveinis
Approved revision: 326
Merged at revision: 329
Proposed branch: lp:~sergei.glushchenko/percona-server/5.6-bug1155859
Merge into: lp:percona-server/5.6
Diff against target: 23 lines (+3/-3)
1 file modified
Percona-Server/sql-common/client.c (+3/-3)
To merge this branch: bzr merge lp:~sergei.glushchenko/percona-server/5.6-bug1155859
Reviewer Review Type Date Requested Status
Laurynas Biveinis (community) Approve
Review via email: mp+156471@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Laurynas Biveinis (laurynas-biveinis) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Percona-Server/sql-common/client.c'
2--- Percona-Server/sql-common/client.c 2013-03-05 12:46:43 +0000
3+++ Percona-Server/sql-common/client.c 2013-04-02 07:15:09 +0000
4@@ -1293,7 +1293,7 @@
5 break;
6 case OPT_plugin_dir:
7 {
8- char buff[FN_REFLEN], buff2[FN_REFLEN];
9+ char buff[FN_REFLEN];
10 if (strlen(opt_arg) >= FN_REFLEN)
11 opt_arg[FN_REFLEN]= '\0';
12 if (my_realpath(buff, opt_arg, 0))
13@@ -1302,8 +1302,8 @@
14 opt_arg));
15 break;
16 }
17- convert_dirname(buff, buff2, NULL);
18- EXTENSION_SET_STRING(options, plugin_dir, buff2);
19+ convert_dirname(buff, buff, NULL);
20+ EXTENSION_SET_STRING(options, plugin_dir, buff);
21 }
22 break;
23 case OPT_default_auth:

Subscribers

People subscribed via source and target branches