summaryrefslogtreecommitdiff
path: root/sql-common
diff options
context:
space:
mode:
authorGeorgi Kodinov <georgi.kodinov@oracle.com>2013-04-24 17:21:42 +0300
committerGeorgi Kodinov <georgi.kodinov@oracle.com>2013-04-24 17:21:42 +0300
commit4814d82d086279e933703277c59257f4d5b9b7ae (patch)
tree217f2b21f5db10f27c146cc2523b1f3bc4cb0385 /sql-common
parentb5f378f8d3c8c3105151d14c66da42e89b017443 (diff)
downloadmariadb-git-4814d82d086279e933703277c59257f4d5b9b7ae.tar.gz
Bug #16680313: CLIENT DOESN'T READ PLUGIN-DIR FROM MY.CNF SET BY
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.
Diffstat (limited to 'sql-common')
-rw-r--r--sql-common/client.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql-common/client.c b/sql-common/client.c
index 91261485a49..1e98eadda28 100644
--- 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;