diff options
| author | Michael Widenius <monty@askmonty.org> | 2011-03-09 15:47:59 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2011-03-09 15:47:59 +0200 |
| commit | 139a2b64bf8ec2e248656835e23a5c98ffc667a8 (patch) | |
| tree | 7d77d6f1073f8090f275b30cb3f10254497da243 /plugin | |
| parent | b3f7eac5301529c2d069ebe4d0558980412af3a2 (diff) | |
| parent | ce675406ca8dbc1532a908803a1371de8432d466 (diff) | |
| download | mariadb-git-139a2b64bf8ec2e248656835e23a5c98ffc667a8.tar.gz | |
Merge with 5.2
Diffstat (limited to 'plugin')
| -rw-r--r-- | plugin/auth/dialog.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/plugin/auth/dialog.c b/plugin/auth/dialog.c index 72c6364f49a..49ab0c9a158 100644 --- a/plugin/auth/dialog.c +++ b/plugin/auth/dialog.c @@ -327,7 +327,10 @@ static int perform_dialog(MYSQL_PLUGIN_VIO *vio, MYSQL *mysql) or fall back to the default implementation. */ -static int init_dialog() +static int init_dialog(char *errbuf __attribute__((unused)), + size_t sizeof_errbuf __attribute__((unused)), + int argc __attribute__((unused)), + va_list args __attribute__((unused))) { void *sym= dlsym(RTLD_DEFAULT, "mysql_authentication_dialog_ask"); ask= sym ? (mysql_authentication_dialog_ask_t)sym : builtin_ask; |