Skip to content

M
MariaDB
Commit 3a62ffc8 authored by unknown's avatar unknown
Browse files
Options

WL#3201 additional post-review fixes 


config/ac-macros/plugins.m4:
  remove unneccessary `ifelse'
  add comment, add missing dnl
configure.in:
  change description for heap engine
include/mysql/plugin.h:
  change macro name
sql/ha_berkeley.cc:
  store strings statically for use in handlerton and plugin structures
sql/ha_federated.cc:
  store strings statically for use in handlerton and plugin structures
sql/ha_heap.cc:
  store strings statically for use in handlerton and plugin structures
sql/ha_innodb.cc:
  store strings statically for use in handlerton and plugin structures
sql/ha_myisam.cc:
  store strings statically for use in handlerton and plugin structures
sql/ha_myisammrg.cc:
  store strings statically for use in handlerton and plugin structures
sql/ha_ndbcluster.cc:
  store strings statically for use in handlerton and plugin structures
sql/ha_partition.cc:
  store strings statically for use in handlerton and plugin structures
storage/archive/ha_archive.cc:
  store strings statically for use in handlerton and plugin structures
storage/blackhole/ha_blackhole.cc:
  store strings statically for use in handlerton and plugin structures
storage/csv/ha_tina.cc:
  store strings statically for use in handlerton and plugin structures
storage/example/ha_example.cc:
  store strings statically for use in handlerton and plugin structures
parent 1ec3fbe0
Hide whitespace changes
Inline Side-by-side
Showing with 100 additions and 58 deletions
config/ac-macros/plugins.m4
View file @ 3a62ffc8
...@@ -38,9 +38,7 @@ AC_DEFUN([_MYSQL_PLUGIN],[ ...@@ -38,9 +38,7 @@ AC_DEFUN([_MYSQL_PLUGIN],[
_MYSQL_PLUGAPPEND([__mysql_plugin_list__],[$1]) _MYSQL_PLUGAPPEND([__mysql_plugin_list__],[$1])
m4_define([MYSQL_PLUGIN_NAME_]AS_TR_CPP([$1]), [$3]) m4_define([MYSQL_PLUGIN_NAME_]AS_TR_CPP([$1]), [$3])
m4_define([MYSQL_PLUGIN_DESC_]AS_TR_CPP([$1]), [$4]) m4_define([MYSQL_PLUGIN_DESC_]AS_TR_CPP([$1]), [$4])
ifelse([$5], [], [], [ _MYSQL_PLUGAPPEND_META([$1], $5)
_MYSQL_PLUGAPPEND_META([$1], $5)
])
]) ])
]) ])
...@@ -351,11 +349,13 @@ AC_DEFUN([__MYSQL_EMIT_CHECK_PLUGIN],[ ...@@ -351,11 +349,13 @@ AC_DEFUN([__MYSQL_EMIT_CHECK_PLUGIN],[
else else
m4_ifdef([$7],[ m4_ifdef([$7],[
ifelse(m4_bregexp($7, [^lib[^.]+\.a$]), -2, [ ifelse(m4_bregexp($7, [^lib[^.]+\.a$]), -2, [
dnl change above "-2" to "0" to enable this section
dnl Although this is "pretty", it breaks libmysqld build
m4_ifdef([$6],[ m4_ifdef([$6],[
mysql_use_plugin_dir="$6" mysql_use_plugin_dir="$6"
mysql_plugin_libs="$mysql_plugin_libs -L[\$(top_builddir)]/$6" mysql_plugin_libs="$mysql_plugin_libs -L[\$(top_builddir)]/$6"
]) ])
mysql_plugin_libs="$mysql_plugin_libs mysql_plugin_libs="$mysql_plugin_libs dnl
[-l]m4_bregexp($7, [^lib\([^.]+\)], [\1])" [-l]m4_bregexp($7, [^lib\([^.]+\)], [\1])"
], m4_bregexp($7, [^\\\$]), 0, [ ], m4_bregexp($7, [^\\\$]), 0, [
m4_ifdef([$6],[ m4_ifdef([$6],[
......
configure.in
View file @ 3a62ffc8
...@@ -91,7 +91,7 @@ MYSQL_PLUGIN_DIRECTORY(ftexample, [plugin/fulltext]) ...@@ -91,7 +91,7 @@ MYSQL_PLUGIN_DIRECTORY(ftexample, [plugin/fulltext])
MYSQL_PLUGIN_DYNAMIC(ftexample, [mypluglib.la]) MYSQL_PLUGIN_DYNAMIC(ftexample, [mypluglib.la])
MYSQL_STORAGE_ENGINE(heap,no, [Memory Storage Engine], MYSQL_STORAGE_ENGINE(heap,no, [Memory Storage Engine],
[In memory hashed tables]) [Volatile memory based tables])
MYSQL_PLUGIN_DIRECTORY(heap, [storage/heap]) MYSQL_PLUGIN_DIRECTORY(heap, [storage/heap])
MYSQL_PLUGIN_STATIC(heap, [libheap.a]) MYSQL_PLUGIN_STATIC(heap, [libheap.a])
MYSQL_PLUGIN_MANDATORY(heap) dnl Memory tables MYSQL_PLUGIN_MANDATORY(heap) dnl Memory tables
......
include/mysql/plugin.h
View file @ 3a62ffc8
...@@ -39,23 +39,23 @@ ...@@ -39,23 +39,23 @@
#ifndef MYSQL_DYNAMIC_PLUGIN #ifndef MYSQL_DYNAMIC_PLUGIN
#define __DECLARE_PLUGIN(NAME, VERSION, PSIZE, DECLS) \ #define __MYSQL_DECLARE_PLUGIN(NAME, VERSION, PSIZE, DECLS) \
int VERSION= MYSQL_PLUGIN_INTERFACE_VERSION; \ int VERSION= MYSQL_PLUGIN_INTERFACE_VERSION; \
int PSIZE= sizeof(struct st_mysql_plugin); \ int PSIZE= sizeof(struct st_mysql_plugin); \
struct st_mysql_plugin DECLS[]= { struct st_mysql_plugin DECLS[]= {
#else #else
#define __DECLARE_PLUGIN(NAME, VERSION, PSIZE, DECLS) \ #define __MYSQL_DECLARE_PLUGIN(NAME, VERSION, PSIZE, DECLS) \
int _mysql_plugin_interface_version_= MYSQL_PLUGIN_INTERFACE_VERSION; \ int _mysql_plugin_interface_version_= MYSQL_PLUGIN_INTERFACE_VERSION; \
int _mysql_sizeof_struct_st_plugin_= sizeof(struct st_mysql_plugin); \ int _mysql_sizeof_struct_st_plugin_= sizeof(struct st_mysql_plugin); \
struct st_mysql_plugin _mysql_plugin_declarations_[]= { struct st_mysql_plugin _mysql_plugin_declarations_[]= {
#endif #endif
#define _DECLARE_PLUGIN(NAME) \ #define mysql_declare_plugin(NAME) \
__DECLARE_PLUGIN(NAME, builtin_ ## NAME ## _plugin_interface_version, \ __MYSQL_DECLARE_PLUGIN(NAME, \
builtin_ ## NAME ## _plugin_interface_version, \
builtin_ ## NAME ## _sizeof_struct_st_plugin, \ builtin_ ## NAME ## _sizeof_struct_st_plugin, \
builtin_ ## NAME ## _plugin) builtin_ ## NAME ## _plugin)
#define mysql_declare_plugin(NAME) _DECLARE_PLUGIN(NAME)
#define mysql_declare_plugin_end ,{0,0,0,0,0,0,0,0,0}} #define mysql_declare_plugin_end ,{0,0,0,0,0,0,0,0,0}}
/* /*
......
sql/ha_berkeley.cc
View file @ 3a62ffc8
...@@ -125,11 +125,15 @@ static int berkeley_savepoint(THD* thd, void *savepoint); ...@@ -125,11 +125,15 @@ static int berkeley_savepoint(THD* thd, void *savepoint);
static int berkeley_release_savepoint(THD* thd, void *savepoint); static int berkeley_release_savepoint(THD* thd, void *savepoint);
static handler *berkeley_create_handler(TABLE_SHARE *table); static handler *berkeley_create_handler(TABLE_SHARE *table);
static const char berkeley_hton_name[]= "BerkeleyDB";
static const char berkeley_hton_comment[]=
"Supports transactions and page-level locking";
handlerton berkeley_hton = { handlerton berkeley_hton = {
MYSQL_HANDLERTON_INTERFACE_VERSION, MYSQL_HANDLERTON_INTERFACE_VERSION,
"BerkeleyDB", berkeley_hton_name,
SHOW_OPTION_YES, SHOW_OPTION_YES,
"Supports transactions and page-level locking", berkeley_hton_comment,
DB_TYPE_BERKELEY_DB, DB_TYPE_BERKELEY_DB,
berkeley_init, berkeley_init,
0, /* slot */ 0, /* slot */
...@@ -2733,9 +2737,9 @@ mysql_declare_plugin(berkeley) ...@@ -2733,9 +2737,9 @@ mysql_declare_plugin(berkeley)
{ {
MYSQL_STORAGE_ENGINE_PLUGIN, MYSQL_STORAGE_ENGINE_PLUGIN,
&berkeley_hton, &berkeley_hton,
berkeley_hton.name, berkeley_hton_name,
"MySQL AB", "Sleepycat Software",
"BerkeleyDB Storage Engine", berkeley_hton_comment,
NULL, /* Plugin Init */ NULL, /* Plugin Init */
NULL, /* Plugin Deinit */ NULL, /* Plugin Deinit */
0x0100 /* 1.0 */, 0x0100 /* 1.0 */,
......
sql/ha_federated.cc
View file @ 3a62ffc8
...@@ -370,11 +370,14 @@ static int federated_rollback(THD *thd, bool all); ...@@ -370,11 +370,14 @@ static int federated_rollback(THD *thd, bool all);
/* Federated storage engine handlerton */ /* Federated storage engine handlerton */
static const char federated_hton_name[]= "FEDERATED";
static const char federated_hton_comment[]= "Federated MySQL storage engine";
handlerton federated_hton= { handlerton federated_hton= {
MYSQL_HANDLERTON_INTERFACE_VERSION, MYSQL_HANDLERTON_INTERFACE_VERSION,
"FEDERATED", federated_hton_name,
SHOW_OPTION_YES, SHOW_OPTION_YES,
"Federated MySQL storage engine", federated_hton_comment,
DB_TYPE_FEDERATED_DB, DB_TYPE_FEDERATED_DB,
federated_db_init, federated_db_init,
0, /* slot */ 0, /* slot */
...@@ -2813,9 +2816,9 @@ mysql_declare_plugin(federated) ...@@ -2813,9 +2816,9 @@ mysql_declare_plugin(federated)
{ {
MYSQL_STORAGE_ENGINE_PLUGIN, MYSQL_STORAGE_ENGINE_PLUGIN,
&federated_hton, &federated_hton,
federated_hton.name, federated_hton_name,
"Patrick Galbraith and Brian Aker, MySQL AB", "Patrick Galbraith and Brian Aker, MySQL AB",
"Federated Storage Engine", federated_hton_comment,
NULL, /* Plugin Init */ NULL, /* Plugin Init */
NULL, /* Plugin Deinit */ NULL, /* Plugin Deinit */
0x0100 /* 1.0 */, 0x0100 /* 1.0 */,
......
sql/ha_heap.cc
View file @ 3a62ffc8
...@@ -26,11 +26,15 @@ ...@@ -26,11 +26,15 @@
static handler *heap_create_handler(TABLE_SHARE *table); static handler *heap_create_handler(TABLE_SHARE *table);
static const char heap_hton_name[]= "MEMORY";
static const char heap_hton_comment[]=
"Hash based, stored in memory, useful for temporary tables";
handlerton heap_hton= { handlerton heap_hton= {
MYSQL_HANDLERTON_INTERFACE_VERSION, MYSQL_HANDLERTON_INTERFACE_VERSION,
"MEMORY", heap_hton_name,
SHOW_OPTION_YES, SHOW_OPTION_YES,
"Hash based, stored in memory, useful for temporary tables", heap_hton_comment,
DB_TYPE_HEAP, DB_TYPE_HEAP,
NULL, NULL,
0, /* slot */ 0, /* slot */
...@@ -711,9 +715,9 @@ mysql_declare_plugin(heap) ...@@ -711,9 +715,9 @@ mysql_declare_plugin(heap)
{ {
MYSQL_STORAGE_ENGINE_PLUGIN, MYSQL_STORAGE_ENGINE_PLUGIN,
&heap_hton, &heap_hton,
heap_hton.name, heap_hton_name,
NULL, "MySQL AB",
heap_hton.comment, heap_hton_comment,
NULL, NULL,
NULL, NULL,
0 0
......
sql/ha_innodb.cc
View file @ 3a62ffc8
...@@ -205,11 +205,15 @@ static int innobase_savepoint(THD* thd, void *savepoint); ...@@ -205,11 +205,15 @@ static int innobase_savepoint(THD* thd, void *savepoint);
static int innobase_release_savepoint(THD* thd, void *savepoint); static int innobase_release_savepoint(THD* thd, void *savepoint);
static handler *innobase_create_handler(TABLE_SHARE *table); static handler *innobase_create_handler(TABLE_SHARE *table);
static const char innobase_hton_name[]= "InnoDB";
static const char innobase_hton_comment[]=
"Supports transactions, row-level locking, and foreign keys";
handlerton innobase_hton = { handlerton innobase_hton = {
MYSQL_HANDLERTON_INTERFACE_VERSION, MYSQL_HANDLERTON_INTERFACE_VERSION,
"InnoDB", innobase_hton_name,
SHOW_OPTION_YES, SHOW_OPTION_YES,
"Supports transactions, row-level locking, and foreign keys", innobase_hton_comment,
DB_TYPE_INNODB, DB_TYPE_INNODB,
innobase_init, innobase_init,
0, /* slot */ 0, /* slot */
...@@ -7439,9 +7443,9 @@ mysql_declare_plugin(innobase) ...@@ -7439,9 +7443,9 @@ mysql_declare_plugin(innobase)
{ {
MYSQL_STORAGE_ENGINE_PLUGIN, MYSQL_STORAGE_ENGINE_PLUGIN,
&innobase_hton, &innobase_hton,
innobase_hton.name, innobase_hton_name,
"Innobase OY", "Innobase OY",
"InnoDB Storage Engine", innobase_hton_comment,
NULL, /* Plugin Init */ NULL, /* Plugin Init */
NULL, /* Plugin Deinit */ NULL, /* Plugin Deinit */
0x0100 /* 1.0 */, 0x0100 /* 1.0 */,
......
sql/ha_myisam.cc
View file @ 3a62ffc8
...@@ -56,11 +56,15 @@ static handler *myisam_create_handler(TABLE_SHARE *table); ...@@ -56,11 +56,15 @@ static handler *myisam_create_handler(TABLE_SHARE *table);
/* MyISAM handlerton */ /* MyISAM handlerton */
static const char myisam_hton_name[]= "MyISAM";
static const char myisam_hton_comment[]=
"Default engine as of MySQL 3.23 with great performance";
handlerton myisam_hton= { handlerton myisam_hton= {
MYSQL_HANDLERTON_INTERFACE_VERSION, MYSQL_HANDLERTON_INTERFACE_VERSION,
"MyISAM", myisam_hton_name,
SHOW_OPTION_YES, SHOW_OPTION_YES,
"Default engine as of MySQL 3.23 with great performance", myisam_hton_comment,
DB_TYPE_MYISAM, DB_TYPE_MYISAM,
NULL, NULL,
0, /* slot */ 0, /* slot */
...@@ -1795,9 +1799,9 @@ mysql_declare_plugin(myisam) ...@@ -1795,9 +1799,9 @@ mysql_declare_plugin(myisam)
{ {
MYSQL_STORAGE_ENGINE_PLUGIN, MYSQL_STORAGE_ENGINE_PLUGIN,
&myisam_hton, &myisam_hton,
myisam_hton.name, myisam_hton_name,
"MySQL AB", "MySQL AB",
"MyISAM Storage Engine", myisam_hton_comment,
NULL, /* Plugin Init */ NULL, /* Plugin Init */
NULL, /* Plugin Deinit */ NULL, /* Plugin Deinit */
0x0100 /* 1.0 */, 0x0100 /* 1.0 */,
......
sql/ha_myisammrg.cc
View file @ 3a62ffc8
...@@ -38,11 +38,15 @@ static handler *myisammrg_create_handler(TABLE_SHARE *table); ...@@ -38,11 +38,15 @@ static handler *myisammrg_create_handler(TABLE_SHARE *table);
/* MyISAM MERGE handlerton */ /* MyISAM MERGE handlerton */
static const char myisammrg_hton_name[]= "MRG_MYISAM";
static const char myisammrg_hton_comment[]=
"Collection of identical MyISAM tables";
handlerton myisammrg_hton= { handlerton myisammrg_hton= {
MYSQL_HANDLERTON_INTERFACE_VERSION, MYSQL_HANDLERTON_INTERFACE_VERSION,
"MRG_MYISAM", myisammrg_hton_name,
SHOW_OPTION_YES, SHOW_OPTION_YES,
"Collection of identical MyISAM tables", myisammrg_hton_comment,
DB_TYPE_MRG_MYISAM, DB_TYPE_MRG_MYISAM,
NULL, NULL,
0, /* slot */ 0, /* slot */
...@@ -580,9 +584,9 @@ mysql_declare_plugin(myisammrg) ...@@ -580,9 +584,9 @@ mysql_declare_plugin(myisammrg)
{ {
MYSQL_STORAGE_ENGINE_PLUGIN, MYSQL_STORAGE_ENGINE_PLUGIN,
&myisammrg_hton, &myisammrg_hton,
myisammrg_hton.name, myisammrg_hton_name,
"MySQL AB", "MySQL AB",
"MyISAMMRG Storage Engine", myisammrg_hton_comment,
NULL, /* Plugin Init */ NULL, /* Plugin Init */
NULL, /* Plugin Deinit */ NULL, /* Plugin Deinit */
0x0100 /* 1.0 */, 0x0100 /* 1.0 */,
......
sql/ha_ndbcluster.cc
View file @ 3a62ffc8
...@@ -69,6 +69,9 @@ static bool ndbcluster_show_status(THD*,stat_print_fn *,enum ha_stat_type); ...@@ -69,6 +69,9 @@ static bool ndbcluster_show_status(THD*,stat_print_fn *,enum ha_stat_type);
static int ndbcluster_alter_tablespace(THD* thd, st_alter_tablespace *info); static int ndbcluster_alter_tablespace(THD* thd, st_alter_tablespace *info);
static int ndbcluster_fill_files_table(THD *thd, TABLE_LIST *tables, COND *cond); static int ndbcluster_fill_files_table(THD *thd, TABLE_LIST *tables, COND *cond);
static const char ndbcluster_hton_name[]= "ndbcluster";
static const char ndbcluster_hton_comment[]= "Clustered, fault-tolerant tables";
handlerton ndbcluster_hton = { handlerton ndbcluster_hton = {
MYSQL_HANDLERTON_INTERFACE_VERSION, MYSQL_HANDLERTON_INTERFACE_VERSION,
"ndbcluster", "ndbcluster",
...@@ -10287,9 +10290,9 @@ mysql_declare_plugin(ndbcluster) ...@@ -10287,9 +10290,9 @@ mysql_declare_plugin(ndbcluster)
{ {
MYSQL_STORAGE_ENGINE_PLUGIN, MYSQL_STORAGE_ENGINE_PLUGIN,
&ndbcluster_hton, &ndbcluster_hton,
ndbcluster_hton.name, ndbcluster_hton_name,
"MySQL AB", "MySQL AB",
"NDB Storage Engine", ndbcluster_hton_comment,
NULL, /* Plugin Init */ NULL, /* Plugin Init */
NULL, /* Plugin Deinit */ NULL, /* Plugin Deinit */
0x0100 /* 1.0 */, 0x0100 /* 1.0 */,
......
sql/ha_partition.cc
View file @ 3a62ffc8
...@@ -73,11 +73,14 @@ static handler *partition_create_handler(TABLE_SHARE *share); ...@@ -73,11 +73,14 @@ static handler *partition_create_handler(TABLE_SHARE *share);
static uint partition_flags(); static uint partition_flags();
static uint alter_table_flags(uint flags); static uint alter_table_flags(uint flags);
static const char partition_hton_name[]= "partition";
static const char partition_hton_comment[]= "Partition Storage Engine Helper";
handlerton partition_hton = { handlerton partition_hton = {
MYSQL_HANDLERTON_INTERFACE_VERSION, MYSQL_HANDLERTON_INTERFACE_VERSION,
"partition", partition_hton_name,
SHOW_OPTION_YES, SHOW_OPTION_YES,
"Partition Storage Engine Helper", /* A comment used by SHOW to describe an engine */ partition_hton_comment, /* A comment used by SHOW to describe an engine */
DB_TYPE_PARTITION_DB, DB_TYPE_PARTITION_DB,
0, /* Method that initializes a storage engine */ 0, /* Method that initializes a storage engine */
0, /* slot */ 0, /* slot */
...@@ -5447,9 +5450,9 @@ mysql_declare_plugin(partition) ...@@ -5447,9 +5450,9 @@ mysql_declare_plugin(partition)
{ {
MYSQL_STORAGE_ENGINE_PLUGIN, MYSQL_STORAGE_ENGINE_PLUGIN,
&partition_hton, &partition_hton,
partition_hton.name, partition_hton_name,
"Mikael Ronstrom, MySQL AB", "Mikael Ronstrom, MySQL AB",
"Partitioning Support", partition_hton_comment,
NULL, /* Plugin Init */ NULL, /* Plugin Init */
NULL, /* Plugin Deinit */ NULL, /* Plugin Deinit */
0x0100 /* 1.0 */, 0x0100 /* 1.0 */,
......
storage/archive/ha_archive.cc
View file @ 3a62ffc8
...@@ -146,12 +146,15 @@ static handler *archive_create_handler(TABLE_SHARE *table); ...@@ -146,12 +146,15 @@ static handler *archive_create_handler(TABLE_SHARE *table);
#define ARCHIVE_MIN_ROWS_TO_USE_BULK_INSERT 2 #define ARCHIVE_MIN_ROWS_TO_USE_BULK_INSERT 2
static const char archive_hton_name[]= "ARCHIVE";
static const char archive_hton_comment[]= "Archive storage engine";
/* dummy handlerton - only to have something to return from archive_db_init */ /* dummy handlerton - only to have something to return from archive_db_init */
handlerton archive_hton = { handlerton archive_hton = {
MYSQL_HANDLERTON_INTERFACE_VERSION, MYSQL_HANDLERTON_INTERFACE_VERSION,
"ARCHIVE", archive_hton_name,
SHOW_OPTION_YES, SHOW_OPTION_YES,
"Archive storage engine", archive_hton_comment,
DB_TYPE_ARCHIVE_DB, DB_TYPE_ARCHIVE_DB,
archive_db_init, archive_db_init,
0, /* slot */ 0, /* slot */
...@@ -1577,9 +1580,9 @@ mysql_declare_plugin(archive) ...@@ -1577,9 +1580,9 @@ mysql_declare_plugin(archive)
{ {
MYSQL_STORAGE_ENGINE_PLUGIN, MYSQL_STORAGE_ENGINE_PLUGIN,
&archive_hton, &archive_hton,
archive_hton.name, archive_hton_name,
"Brian Aker, MySQL AB", "Brian Aker, MySQL AB",
"Archive Storage Engine", archive_hton_comment,
NULL, /* Plugin Init */ NULL, /* Plugin Init */
archive_db_done, /* Plugin Deinit */ archive_db_done, /* Plugin Deinit */
0x0100 /* 1.0 */, 0x0100 /* 1.0 */,
......
storage/blackhole/ha_blackhole.cc
View file @ 3a62ffc8
...@@ -29,13 +29,17 @@ ...@@ -29,13 +29,17 @@
static handler *blackhole_create_handler(TABLE_SHARE *table); static handler *blackhole_create_handler(TABLE_SHARE *table);
static const char blackhole_hton_name[]= "BLACKHOLE";
static const char blackhole_hton_comment[]=
"/dev/null storage engine (anything you write to it disappears)";
/* Blackhole storage engine handlerton */ /* Blackhole storage engine handlerton */
handlerton blackhole_hton= { handlerton blackhole_hton= {
MYSQL_HANDLERTON_INTERFACE_VERSION, MYSQL_HANDLERTON_INTERFACE_VERSION,
"BLACKHOLE", blackhole_hton_name,
SHOW_OPTION_YES, SHOW_OPTION_YES,
"/dev/null storage engine (anything you write to it disappears)", blackhole_hton_comment,
DB_TYPE_BLACKHOLE_DB, DB_TYPE_BLACKHOLE_DB,
NULL, NULL,
0, /* slot */ 0, /* slot */
...@@ -256,9 +260,9 @@ mysql_declare_plugin(blackhole) ...@@ -256,9 +260,9 @@ mysql_declare_plugin(blackhole)
{ {
MYSQL_STORAGE_ENGINE_PLUGIN, MYSQL_STORAGE_ENGINE_PLUGIN,
&blackhole_hton, &blackhole_hton,
blackhole_hton.name, blackhole_hton_name,
"MySQL AB", "MySQL AB",
"Blackhole Storage Engine", blackhole_hton_comment,
NULL, /* Plugin Init */ NULL, /* Plugin Init */
NULL, /* Plugin Deinit */ NULL, /* Plugin Deinit */
0x0100 /* 1.0 */, 0x0100 /* 1.0 */,
......
storage/csv/ha_tina.cc
View file @ 3a62ffc8
...@@ -77,11 +77,14 @@ static int tina_init= 0; ...@@ -77,11 +77,14 @@ static int tina_init= 0;
static handler *tina_create_handler(TABLE_SHARE *table); static handler *tina_create_handler(TABLE_SHARE *table);
static int tina_init_func(); static int tina_init_func();
static const char tina_hton_name[]= "CSV";
static const char tina_hton_comment[]= "CSV storage engine";
handlerton tina_hton= { handlerton tina_hton= {
MYSQL_HANDLERTON_INTERFACE_VERSION, MYSQL_HANDLERTON_INTERFACE_VERSION,
"CSV", tina_hton_name,
SHOW_OPTION_YES, SHOW_OPTION_YES,
"CSV storage engine", tina_hton_comment,
DB_TYPE_CSV_DB, DB_TYPE_CSV_DB,
(bool (*)()) tina_init_func, (bool (*)()) tina_init_func,
0, /* slot */ 0, /* slot */
...@@ -1403,9 +1406,9 @@ mysql_declare_plugin(csv) ...@@ -1403,9 +1406,9 @@ mysql_declare_plugin(csv)
{ {
MYSQL_STORAGE_ENGINE_PLUGIN, MYSQL_STORAGE_ENGINE_PLUGIN,
&tina_hton, &tina_hton,
tina_hton.name, tina_hton_name,
"Brian Aker, MySQL AB", "Brian Aker, MySQL AB",
"CSV Storage Engine", tina_hton_comment,
tina_init_func, /* Plugin Init */ tina_init_func, /* Plugin Init */
tina_done_func, /* Plugin Deinit */ tina_done_func, /* Plugin Deinit */
0x0100 /* 1.0 */, 0x0100 /* 1.0 */,
......
storage/example/ha_example.cc
View file @ 3a62ffc8
...@@ -77,11 +77,14 @@ static int example_init_func(); ...@@ -77,11 +77,14 @@ static int example_init_func();
static bool example_init_func_for_handlerton(); static bool example_init_func_for_handlerton();
static int example_panic(enum ha_panic_function flag); static int example_panic(enum ha_panic_function flag);
static const char example_hton_name[]= "EXAMPLE";
static const char example_hton_comment[]= "Example storage engine";
handlerton example_hton= { handlerton example_hton= {
MYSQL_HANDLERTON_INTERFACE_VERSION, MYSQL_HANDLERTON_INTERFACE_VERSION,
"EXAMPLE", example_hton_name,
SHOW_OPTION_YES, SHOW_OPTION_YES,
"Example storage engine", example_hton_comment,
DB_TYPE_EXAMPLE_DB, DB_TYPE_EXAMPLE_DB,
example_init_func_for_handlerton, example_init_func_for_handlerton,
0, /* slot */ 0, /* slot */
...@@ -747,9 +750,9 @@ mysql_declare_plugin(example) ...@@ -747,9 +750,9 @@ mysql_declare_plugin(example)
{ {
MYSQL_STORAGE_ENGINE_PLUGIN, MYSQL_STORAGE_ENGINE_PLUGIN,
&example_hton, &example_hton,
example_hton.name, example_hton_name,
"Brian Aker, MySQL AB", "Brian Aker, MySQL AB",
"Example Storage Engine", example_hton_comment,
example_init_func, /* Plugin Init */ example_init_func, /* Plugin Init */
example_done_func, /* Plugin Deinit */ example_done_func, /* Plugin Deinit */
0x0001 /* 0.1 */, 0x0001 /* 0.1 */,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7