diff options
| author | Alexander Nozdrin <alik@sun.com> | 2010-02-23 18:49:21 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2010-02-23 18:49:21 +0300 |
| commit | b6e0f92f052a37568b984330b8cca8331c979a8d (patch) | |
| tree | df9457baf92d1aba63e31cc13fdfe0cc6b6e4be6 /sql/sql_builtin.cc.in | |
| parent | 1e6b33ec0f7ba01cb0bb86b6a1f0972c01d0b803 (diff) | |
| parent | 7684386f1111be55ba8ac66f03676aeba5a089da (diff) | |
| download | mariadb-git-b6e0f92f052a37568b984330b8cca8331c979a8d.tar.gz | |
Auto-merge from mysql-next-mr-bugfixing.
Diffstat (limited to 'sql/sql_builtin.cc.in')
| -rw-r--r-- | sql/sql_builtin.cc.in | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/sql/sql_builtin.cc.in b/sql/sql_builtin.cc.in index f8767949fe3..d9d9b610baf 100644 --- a/sql/sql_builtin.cc.in +++ b/sql/sql_builtin.cc.in @@ -17,7 +17,12 @@ typedef struct st_mysql_plugin builtin_plugin[]; -extern builtin_plugin +#ifdef _MSC_VER +extern "C" +#else +extern +#endif +builtin_plugin @mysql_mandatory_plugins@ @mysql_optional_plugins@ builtin_binlog_plugin; struct st_mysql_plugin *mysql_optional_plugins[]= @@ -29,5 +34,3 @@ struct st_mysql_plugin *mysql_mandatory_plugins[]= { builtin_binlog_plugin, @mysql_mandatory_plugins@ 0 }; - - |