diff options
Diffstat (limited to 'sql/sql_builtin.cc.in')
| -rw-r--r-- | sql/sql_builtin.cc.in | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/sql/sql_builtin.cc.in b/sql/sql_builtin.cc.in index 3becdbaccfe..cf7006fc7ce 100644 --- a/sql/sql_builtin.cc.in +++ b/sql/sql_builtin.cc.in @@ -1,4 +1,4 @@ -/* Copyright (C) 2006 MySQL AB +/* Copyright (c) 2006, 2010, 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 @@ -17,11 +17,20 @@ typedef struct st_mysql_plugin builtin_plugin[]; -extern builtin_plugin - builtin_binlog_plugin@mysql_plugin_defs@; +#ifdef _MSC_VER +extern "C" +#else +extern +#endif +builtin_plugin + @mysql_mandatory_plugins@ @mysql_optional_plugins@ builtin_binlog_plugin, builtin_mysql_password_plugin; -struct st_mysql_plugin *mysqld_builtins[]= +struct st_mysql_plugin *mysql_optional_plugins[]= { - builtin_binlog_plugin@mysql_plugin_defs@,(struct st_mysql_plugin *)0 + @mysql_optional_plugins@ 0 }; +struct st_mysql_plugin *mysql_mandatory_plugins[]= +{ + builtin_binlog_plugin, builtin_mysql_password_plugin, @mysql_mandatory_plugins@ 0 +}; |