Bug #16680313: CLIENT DOESN'T READ PLUGIN-DIR FROM MY.CNF SET BY

gkodinov · gkodinov · commit 4814d82d0862 · 2013-04-24T17:21:42.000+03:00
MYSQL_READ_DEFAULT_FILE
Parsing of the plugin-dir config file option was not working due to a typo.
Fixed the typo. No test case can be added due to lack of support for 
defaults-exitra-file testing in mysql-test-run.pl.
Thanks to Sinisa for contributing the fix.
diff --git a/sql-common/client.c b/sql-common/client.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -1394,7 +1394,7 @@ void mysql_read_default_options(struct st_mysql_options *options,
                                     opt_arg));
               break;
             }
-            convert_dirname(buff, buff2, NULL);
+            convert_dirname(buff2, buff, NULL);
             EXTENSION_SET_STRING(options, plugin_dir, buff2);
           }
           break;

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-/* Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.`
	`1`	`+/* Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.`
`2`	`2`
`3`	`3`	`This program is free software; you can redistribute it and/or modify`
`4`	`4`	`it under the terms of the GNU General Public License as published by`
`@@ -1394,7 +1394,7 @@ void mysql_read_default_options(struct st_mysql_options *options,`
`1394`	`1394`	`opt_arg));`
`1395`	`1395`	`break;`
`1396`	`1396`	`}`
`1397`		`- convert_dirname(buff, buff2, NULL);`
	`1397`	`+ convert_dirname(buff2, buff, NULL);`
`1398`	`1398`	`EXTENSION_SET_STRING(options, plugin_dir, buff2);`
`1399`	`1399`	`}`
`1400`	`1400`	`break;`