diff options
| author | Vladislav Vaintroub <vvaintroub@fedora12> | 2009-12-25 16:49:21 +0100 |
|---|---|---|
| committer | Vladislav Vaintroub <vvaintroub@fedora12> | 2009-12-25 16:49:21 +0100 |
| commit | 541edcc2e4a746908e508c6f997baf13c02aee89 (patch) | |
| tree | 7759e1bcb9d4f5273bfcaada45aac3885f5cd8fe /sql/sql_builtin.cc.in | |
| parent | 0940d7d2040f71686901bcc0cd708f562a9ee271 (diff) | |
| parent | 6c716007d13ffd74bb5c3dd7c512d4d7026a23d8 (diff) | |
| download | mariadb-git-541edcc2e4a746908e508c6f997baf13c02aee89.tar.gz | |
merge
Diffstat (limited to 'sql/sql_builtin.cc.in')
| -rw-r--r-- | sql/sql_builtin.cc.in | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/sql/sql_builtin.cc.in b/sql/sql_builtin.cc.in index 1b9b152247f..d9d9b610baf 100644 --- a/sql/sql_builtin.cc.in +++ b/sql/sql_builtin.cc.in @@ -17,16 +17,20 @@ typedef struct st_mysql_plugin builtin_plugin[]; -#if defined(_MSC_VER) +#ifdef _MSC_VER extern "C" #else extern #endif builtin_plugin - builtin_binlog_plugin@mysql_plugin_defs@; + @mysql_mandatory_plugins@ @mysql_optional_plugins@ builtin_binlog_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, @mysql_mandatory_plugins@ 0 +}; |