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

[Sergei Glushchenko]

This is aa fix for bug in client library which makes plugin-dir setting in my.cnf impossible to use if my.cnf is passed to library by using mysql_options(..., MYSQL_READ_DEFAULT_FILE, "my.cnf"). The cause of this bug is incorrect use of convert_dirname. Fixed library has been checked and work correctly with MySQLdb (MySQL connector for Python which uses libmysqlclient). Python script is able to authorize via PAM and load dialog.so plugin from Percona Server distribution.

Did not test with Perl, assuming that if Perl connector work correct there should't be any issues with it as well.

http://jenkins.percona.com/view/PS%205.5/job/percona-server-5.5-param/710/

[Sergei Glushchenko (sergei.glushchenko)]

forgot to mention, it is #29131

[Laurynas Biveinis (laurynas-biveinis)]

The fix looks good, feel free to point out the wrong convert_dirname() call on the upstream bug report.

For approval it needs the 5.6 MP however.

[Laurynas Biveinis (laurynas-biveinis)]

review: Approve

=== modified file 'Percona-Server/sql-common/client.c'
--- Percona-Server/sql-common/client.c	2012-09-17 13:08:32 +0000
+++ Percona-Server/sql-common/client.c	2013-04-01 15:08:30 +0000
@@ -1385,7 +1385,7 @@
           break;
         case OPT_plugin_dir:
           {
-            char buff[FN_REFLEN], buff2[FN_REFLEN];
+            char buff[FN_REFLEN];
             if (strlen(opt_arg) >= FN_REFLEN)
               opt_arg[FN_REFLEN]= '\0';
             if (my_realpath(buff, opt_arg, 0))
@@ -1394,8 +1394,8 @@
                                     opt_arg));
               break;
             }
-            convert_dirname(buff, buff2, NULL);
-            EXTENSION_SET_STRING(options, plugin_dir, buff2);
+            convert_dirname(buff, buff, NULL);
+            EXTENSION_SET_STRING(options, plugin_dir, buff);
           }
           break;
         case OPT_default_auth: