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: no longer in the source branch.
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
=== modified file 'Percona-Server/sql-common/client.c'
--- Percona-Server/sql-common/client.c 2013-03-05 12:46:43 +0000
+++ Percona-Server/sql-common/client.c 2013-04-02 07:15:09 +0000
@@ -1293,7 +1293,7 @@
1293 break;1293 break;
1294 case OPT_plugin_dir:1294 case OPT_plugin_dir:
1295 {1295 {
1296 char buff[FN_REFLEN], buff2[FN_REFLEN];1296 char buff[FN_REFLEN];
1297 if (strlen(opt_arg) >= FN_REFLEN)1297 if (strlen(opt_arg) >= FN_REFLEN)
1298 opt_arg[FN_REFLEN]= '\0';1298 opt_arg[FN_REFLEN]= '\0';
1299 if (my_realpath(buff, opt_arg, 0))1299 if (my_realpath(buff, opt_arg, 0))
@@ -1302,8 +1302,8 @@
1302 opt_arg));1302 opt_arg));
1303 break;1303 break;
1304 }1304 }
1305 convert_dirname(buff, buff2, NULL);1305 convert_dirname(buff, buff, NULL);
1306 EXTENSION_SET_STRING(options, plugin_dir, buff2);1306 EXTENSION_SET_STRING(options, plugin_dir, buff);
1307 }1307 }
1308 break;1308 break;
1309 case OPT_default_auth:1309 case OPT_default_auth:

Subscribers

People subscribed via source and target branches