diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2014-09-25 23:00:45 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2014-10-01 23:38:27 +0200 |
| commit | 3620910eeac8f118c9a6cb8a1c0ec23e56fb5d98 (patch) | |
| tree | d08462d84d10324bd05836c968288d8ab1739e11 /sql/sql_builtin.cc.in | |
| parent | b04f848176b0d8af41eb3627ba1b6ed4dd3327e3 (diff) | |
| download | mariadb-git-3620910eeac8f118c9a6cb8a1c0ec23e56fb5d98.tar.gz | |
cleanup: galera merge, simple changes
Diffstat (limited to 'sql/sql_builtin.cc.in')
| -rw-r--r-- | sql/sql_builtin.cc.in | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_builtin.cc.in b/sql/sql_builtin.cc.in index 2de475b0a76..5bf0a682369 100644 --- a/sql/sql_builtin.cc.in +++ b/sql/sql_builtin.cc.in @@ -27,7 +27,7 @@ builtin_maria_plugin @mysql_mandatory_plugins@ @mysql_optional_plugins@ builtin_maria_binlog_plugin, #ifdef WITH_WSREP - builtin_wsrep_plugin@mysql_plugin_defs@, + builtin_wsrep_plugin, #endif /* WITH_WSREP */ builtin_maria_mysql_password_plugin; @@ -40,7 +40,7 @@ struct st_maria_plugin *mysql_mandatory_plugins[]= { builtin_maria_binlog_plugin, builtin_maria_mysql_password_plugin, #ifdef WITH_WSREP - builtin_wsrep_plugin@mysql_plugin_defs@, + builtin_wsrep_plugin, #endif /* WITH_WSREP */ @mysql_mandatory_plugins@ 0 }; |