diff options
| author | Konstantin Osipov <kostja@sun.com> | 2010-02-03 03:06:42 +0300 |
|---|---|---|
| committer | Konstantin Osipov <kostja@sun.com> | 2010-02-03 03:06:42 +0300 |
| commit | 056ac55aa0954b3321aa5e838a5563e731c1c516 (patch) | |
| tree | 8555c47c0ce18227ce535252d2c2966af26183d3 /sql/sql_builtin.cc.in | |
| parent | a6daa9ada052b7b7b09683ea6d565c92f5e15512 (diff) | |
| parent | 3701208a2e890d42aabc678a2a5d4ea539941b36 (diff) | |
| download | mariadb-git-056ac55aa0954b3321aa5e838a5563e731c1c516.tar.gz | |
Merge next-mr -> next-4284.
Diffstat (limited to 'sql/sql_builtin.cc.in')
| -rw-r--r-- | sql/sql_builtin.cc.in | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/sql/sql_builtin.cc.in b/sql/sql_builtin.cc.in index 3becdbaccfe..f8767949fe3 100644 --- a/sql/sql_builtin.cc.in +++ b/sql/sql_builtin.cc.in @@ -18,10 +18,16 @@ typedef struct st_mysql_plugin builtin_plugin[]; extern 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 +}; + + |