summaryrefslogtreecommitdiff
path: root/client/mysql.cc
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2011-12-02 16:26:43 +0100
committerSergei Golubchik <sergii@pisem.net>2011-12-02 16:26:43 +0100
commitd5fd757a4279f4fa8f032c6dd63d1d121d8e1fea (patch)
treead5b63e8b1d154ab7b1753f9e156e7741b01899d /client/mysql.cc
parent791286ee1c3c705cb8853e242cdf718a7b5ce5b7 (diff)
downloadmariadb-git-d5fd757a4279f4fa8f032c6dd63d1d121d8e1fea.tar.gz
1. add --plugin-dir and --default-auth to mysqltest.
2. dialog plugin now always returns mysql->password if non-empty and the first question is of password type 3. split get_tty_password into get_tty_password_buff and strdup. 4. dialog plugin now uses get_tty_password by default 5. dialog.test 6. moved small tests of individual plugins into a dedicated suite
Diffstat (limited to 'client/mysql.cc')
-rw-r--r--client/mysql.cc7
1 files changed, 4 insertions, 3 deletions
diff --git a/client/mysql.cc b/client/mysql.cc
index 82ffaa22032..0ce28fa90c6 100644
--- a/client/mysql.cc
+++ b/client/mysql.cc
@@ -4319,9 +4319,10 @@ char *get_arg(char *line, my_bool get_next_arg)
string, and the "dialog" plugin will free() it.
*/
-extern "C" char *mysql_authentication_dialog_ask(MYSQL *mysql, int type,
- const char *prompt,
- char *buf, int buf_len)
+MYSQL_PLUGIN_EXPORT
+char *mysql_authentication_dialog_ask(MYSQL *mysql, int type,
+ const char *prompt,
+ char *buf, int buf_len)
{
char *s=buf;