database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

mysql-5.5.18 merge

Browse Source
This commit is contained in:
Sergei Golubchik
2011-11-03 19:17:05 +01:00
parent 3794110f02 6814762551
commit 0e007344ea
1160 changed files with 12821 additions and 6204 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
storage/sphinx/ha_sphinx.cc
View File

@ -3077,25 +3077,6 @@ struct st_mysql_show_var sphinx_status_vars[] =
{0, 0, (enum_mysql_show_type)0}
};
mysql_declare_plugin(sphinx)
{
MYSQL_STORAGE_ENGINE_PLUGIN,
&sphinx_storage_engine,
sphinx_hton_name,
"Sphinx developers",
sphinx_hton_comment,
PLUGIN_LICENSE_GPL,
sphinx_init_func, // Plugin Init
sphinx_done_func, // Plugin Deinit
0x0001, // 0.1
sphinx_status_vars,
NULL,
NULL
}
mysql_declare_plugin_end;
#ifdef maria_declare_plugin
maria_declare_plugin(sphinx)
{
MYSQL_STORAGE_ENGINE_PLUGIN,
@ -3113,7 +3094,6 @@ maria_declare_plugin(sphinx)
MariaDB_PLUGIN_MATURITY_EXPERIMENTAL
}
maria_declare_plugin_end;
#endif
#endif // >50100