diff options
author | Sergei Golubchik <sergii@pisem.net> | 2011-11-03 19:17:05 +0100 |
---|---|---|
committer | Sergei Golubchik <sergii@pisem.net> | 2011-11-03 19:17:05 +0100 |
commit | 0e007344eae972b9be7d88ca43373cb33662ac1c (patch) | |
tree | 7b3561cb3ea2ad24d013e847680ec165f406387e /storage/pbxt | |
parent | 3794110f0215f0631107c2694dc0f1675a4bb520 (diff) | |
parent | 681476255147dacac7e3674b6cd2ae770fee2208 (diff) | |
download | mariadb-git-0e007344eae972b9be7d88ca43373cb33662ac1c.tar.gz |
mysql-5.5.18 merge
Diffstat (limited to 'storage/pbxt')
-rw-r--r-- | storage/pbxt/src/ha_pbxt.cc | 58 |
1 files changed, 0 insertions, 58 deletions
diff --git a/storage/pbxt/src/ha_pbxt.cc b/storage/pbxt/src/ha_pbxt.cc index 7305f80f0fb..1aec6426c8a 100644 --- a/storage/pbxt/src/ha_pbxt.cc +++ b/storage/pbxt/src/ha_pbxt.cc @@ -6120,62 +6120,6 @@ static struct st_mysql_sys_var* pbxt_system_variables[] = { }; #endif -#ifdef DRIZZLED -drizzle_declare_plugin(pbxt) -#else -mysql_declare_plugin(pbxt) -#endif -{ -#ifndef DRIZZLED - MYSQL_STORAGE_ENGINE_PLUGIN, - &pbxt_storage_engine, -#endif - "PBXT", -#ifdef DRIZZLED - "1.0", -#endif - "Paul McCullagh, PrimeBase Technologies GmbH", - "High performance, multi-versioning transactional engine", - PLUGIN_LICENSE_GPL, - pbxt_init, /* Plugin Init */ - pbxt_end, /* Plugin Deinit */ -#ifndef DRIZZLED - 0x0001 /* 0.1 */, -#endif - NULL, /* status variables */ -#if MYSQL_VERSION_ID >= 50118 - pbxt_system_variables, /* system variables */ -#else - NULL, -#endif - NULL /* config options */ -}, -{ -#ifndef DRIZZLED - MYSQL_INFORMATION_SCHEMA_PLUGIN, - &pbxt_statitics, -#endif - "PBXT_STATISTICS", -#ifdef DRIZZLED - "1.0", -#endif - "Paul McCullagh, PrimeBase Technologies GmbH", - "PBXT internal system statitics", - PLUGIN_LICENSE_GPL, - pbxt_init_statistics, /* plugin init */ - pbxt_exit_statistics, /* plugin deinit */ -#ifndef DRIZZLED - 0x0005, -#endif - NULL, /* status variables */ - NULL, /* system variables */ - NULL /* config options */ -} -#ifdef DRIZZLED -drizzle_declare_plugin_end; -#else -mysql_declare_plugin_end; -#if defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID > 50200 maria_declare_plugin(pbxt) { /* PBXT */ MYSQL_STORAGE_ENGINE_PLUGIN, @@ -6208,8 +6152,6 @@ maria_declare_plugin(pbxt) MariaDB_PLUGIN_MATURITY_GAMMA /* maturity */ } maria_declare_plugin_end; -#endif -#endif #if defined(XT_WIN) && defined(XT_COREDUMP) |