diff options
Diffstat (limited to 'plugin')
| -rw-r--r-- | plugin/Makefile.am | 3 | ||||
| -rw-r--r-- | plugin/auth/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | plugin/auth/dialog.c | 18 | ||||
| -rw-r--r-- | plugin/daemon_example/Makefile.am | 2 | ||||
| -rw-r--r-- | plugin/feedback/feedback.h | 3 | ||||
| -rw-r--r-- | plugin/fulltext/plugin_example.c | 2 |
6 files changed, 17 insertions, 14 deletions
diff --git a/plugin/Makefile.am b/plugin/Makefile.am index e6d9ee4d823..9f58d3c7030 100644 --- a/plugin/Makefile.am +++ b/plugin/Makefile.am @@ -1,4 +1,5 @@ -# Copyright (C) 2005-2006 MySQL AB +# Copyright (c) 2005-2007 MySQL AB, 2009 Sun Microsystems, Inc. +# Use is subject to license terms. # # 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 diff --git a/plugin/auth/CMakeLists.txt b/plugin/auth/CMakeLists.txt new file mode 100644 index 00000000000..931a47fec5e --- /dev/null +++ b/plugin/auth/CMakeLists.txt @@ -0,0 +1,3 @@ +INCLUDE("${PROJECT_SOURCE_DIR}/storage/mysql_storage_engine.cmake") +SET(AUTH_SOURCES dialog.c) +MYSQL_PLUGIN(AUTH) diff --git a/plugin/auth/dialog.c b/plugin/auth/dialog.c index 49ab0c9a158..76b2ddae528 100644 --- a/plugin/auth/dialog.c +++ b/plugin/auth/dialog.c @@ -33,13 +33,16 @@ a correct password. It shows the situation when a number of questions is not known in advance. */ -#define _GNU_SOURCE /* for RTLD_DEFAULT */ - -#include <mysql/plugin_auth.h> +#include <my_global.h> #include <mysql/client_plugin.h> +#include <mysql.h> #include <string.h> -#include <stdio.h> -#include <stdlib.h> + +#if defined (_WIN32) +# define RTLD_DEFAULT GetModuleHandle(NULL) +#endif + +#include <mysql/plugin_auth.h> /** first byte of the question string is the question "type". @@ -51,8 +54,6 @@ #define PASSWORD_QUESTION "\4" #define LAST_PASSWORD "\5" -typedef unsigned char uchar; - /********************* SERVER SIDE ****************************************/ /** @@ -216,9 +217,6 @@ maria_declare_plugin_end; dialog plugin will use it for communication with the user. Otherwise a default gets() based implementation will be used. */ -#include <mysql.h> -#include <dlfcn.h> - static mysql_authentication_dialog_ask_t ask; static char *builtin_ask(MYSQL *mysql __attribute__((unused)), diff --git a/plugin/daemon_example/Makefile.am b/plugin/daemon_example/Makefile.am index 5905e3ef075..4a7409518b6 100644 --- a/plugin/daemon_example/Makefile.am +++ b/plugin/daemon_example/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2006 MySQL AB +# Copyright (c) 2006, 2010, Oracle and/or its affiliates # # 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 diff --git a/plugin/feedback/feedback.h b/plugin/feedback/feedback.h index 60ef72eed84..df9020fc37e 100644 --- a/plugin/feedback/feedback.h +++ b/plugin/feedback/feedback.h @@ -12,8 +12,9 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ - +#ifndef MYSQL_SERVER #define MYSQL_SERVER +#endif #include <mysql_priv.h> namespace feedback { diff --git a/plugin/fulltext/plugin_example.c b/plugin/fulltext/plugin_example.c index aebdc007d92..cc84cb6161b 100644 --- a/plugin/fulltext/plugin_example.c +++ b/plugin/fulltext/plugin_example.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2005, 2011, Oracle and/or its affiliates 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 |